/ SGI Freeware 1999 August / SGI Freeware 1999 August.iso / dist / fw_emacs.idb / usr / freeware / share / emacs / 19.34 / lisp / ediff-diff.elc.z / ediff-diff.elc

MacOS 8.1

Win98

DOS

view JSON data

view as text

+--------+-------------------------+-------------------------+--------+--------+
|00000000| 3b 45 4c 43 13 00 00 00 | 0a 3b 3b 3b 20 63 6f 6d |;ELC....|.;;; com|
|00000010| 70 69 6c 65 64 20 62 79 | 20 6b 77 7a 68 40 6e 75 |piled by| kwzh@nu|
|00000020| 74 72 69 6d 61 74 2e 67 | 6e 75 2e 61 69 2e 6d 69 |trimat.g|nu.ai.mi|
|00000030| 74 2e 65 64 75 20 6f 6e | 20 57 65 64 20 4a 75 6c |t.edu on| Wed Jul|
|00000040| 20 31 37 20 31 35 3a 34 | 30 3a 34 38 20 31 39 39 | 17 15:4|0:48 199|
|00000050| 36 0a 3b 3b 3b 20 66 72 | 6f 6d 20 66 69 6c 65 20 |6.;;; fr|om file |
|00000060| 2f 67 64 2f 67 6e 75 2f | 65 6d 61 63 73 2f 31 39 |/gd/gnu/|emacs/19|
|00000070| 2e 30 2f 6c 69 73 70 2f | 65 64 69 66 66 2d 64 69 |.0/lisp/|ediff-di|
|00000080| 66 66 2e 65 6c 0a 3b 3b | 3b 20 65 6d 61 63 73 20 |ff.el.;;|; emacs |
|00000090| 76 65 72 73 69 6f 6e 20 | 31 39 2e 33 31 2e 39 34 |version |19.31.94|
|000000a0| 2e 31 2e 0a 3b 3b 3b 20 | 62 79 74 65 63 6f 6d 70 |.1..;;; |bytecomp|
|000000b0| 20 76 65 72 73 69 6f 6e | 20 46 53 46 20 32 2e 31 | version| FSF 2.1|
|000000c0| 30 0a 3b 3b 3b 20 6f 70 | 74 69 6d 69 7a 61 74 69 |0.;;; op|timizati|
|000000d0| 6f 6e 20 69 73 20 6f 6e | 2e 0a 3b 3b 3b 20 74 68 |on is on|..;;; th|
|000000e0| 69 73 20 66 69 6c 65 20 | 75 73 65 73 20 6f 70 63 |is file |uses opc|
|000000f0| 6f 64 65 73 20 77 68 69 | 63 68 20 64 6f 20 6e 6f |odes whi|ch do no|
|00000100| 74 20 65 78 69 73 74 20 | 69 6e 20 45 6d 61 63 73 |t exist |in Emacs|
|00000110| 20 31 38 2e 0a 0a 28 69 | 66 20 28 61 6e 64 20 28 | 18...(i|f (and (|
|00000120| 62 6f 75 6e 64 70 20 27 | 65 6d 61 63 73 2d 76 65 |boundp '|emacs-ve|
|00000130| 72 73 69 6f 6e 29 0a 09 | 20 28 6f 72 20 28 61 6e |rsion)..| (or (an|
|00000140| 64 20 28 62 6f 75 6e 64 | 70 20 27 65 70 6f 63 68 |d (bound|p 'epoch|
|00000150| 3a 3a 76 65 72 73 69 6f | 6e 29 20 65 70 6f 63 68 |::versio|n) epoch|
|00000160| 3a 3a 76 65 72 73 69 6f | 6e 29 0a 09 20 20 20 20 |::versio|n)..    |
|00000170| 20 28 73 74 72 69 6e 67 | 2d 6c 65 73 73 70 20 65 | (string|-lessp e|
|00000180| 6d 61 63 73 2d 76 65 72 | 73 69 6f 6e 20 22 31 39 |macs-ver|sion "19|
|00000190| 2e 32 39 22 29 29 29 0a | 20 20 20 20 28 65 72 72 |.29"))).|    (err|
|000001a0| 6f 72 20 22 60 65 64 69 | 66 66 2d 64 69 66 66 2e |or "`edi|ff-diff.|
|000001b0| 65 6c 27 20 77 61 73 20 | 63 6f 6d 70 69 6c 65 64 |el' was |compiled|
|000001c0| 20 66 6f 72 20 45 6d 61 | 63 73 20 31 39 2e 32 39 | for Ema|cs 19.29|
|000001d0| 20 6f 72 20 6c 61 74 65 | 72 22 29 29 0a 0a 0a 28 | or late|r"))...(|
|000001e0| 72 65 71 75 69 72 65 20 | 28 71 75 6f 74 65 20 65 |require |(quote e|
|000001f0| 64 69 66 66 2d 69 6e 69 | 74 29 29 0a 23 40 33 36 |diff-ini|t)).#@36|
|00000200| 36 20 2a 54 68 65 20 73 | 68 65 6c 6c 20 75 73 65 |6 *The s|hell use|
|00000210| 64 20 74 6f 20 72 75 6e | 20 64 69 66 66 20 61 6e |d to run| diff an|
|00000220| 64 20 70 61 74 63 68 2e | 20 20 49 66 20 75 73 65 |d patch.|  If use|
|00000230| 72 27 73 20 2e 70 72 6f | 66 69 6c 65 20 6f 72 0a |r's .pro|file or.|
|00000240| 2e 63 73 68 72 63 20 66 | 69 6c 65 73 20 61 72 65 |.cshrc f|iles are|
|00000250| 20 73 65 74 20 75 70 20 | 63 6f 72 72 65 63 74 6c | set up |correctl|
|00000260| 79 2c 20 61 6e 79 20 73 | 68 65 6c 6c 20 77 69 6c |y, any s|hell wil|
|00000270| 6c 20 64 6f 2e 20 20 48 | 6f 77 65 76 65 72 2c 20 |l do.  H|owever, |
|00000280| 73 6f 6d 65 20 70 65 6f | 70 6c 65 0a 73 65 74 20 |some peo|ple.set |
|00000290| 24 70 72 6f 6d 70 74 20 | 6f 72 20 6f 74 68 65 72 |$prompt |or other|
|000002a0| 20 74 68 69 6e 67 73 20 | 69 6e 63 6f 72 72 65 63 | things |incorrec|
|000002b0| 74 6c 79 2c 20 77 68 69 | 63 68 20 6c 65 61 64 73 |tly, whi|ch leads|
|000002c0| 20 74 6f 20 75 6e 64 65 | 73 69 72 61 62 6c 65 20 | to unde|sirable |
|000002d0| 6f 75 74 70 75 74 0a 6d | 65 73 73 61 67 65 73 2e |output.m|essages.|
|000002e0| 20 20 54 68 65 73 65 20 | 6d 61 79 20 63 61 75 73 |  These |may caus|
|000002f0| 65 20 45 64 69 66 66 20 | 74 6f 20 66 61 69 6c 2e |e Ediff |to fail.|
|00000300| 20 20 49 6e 20 73 75 63 | 68 20 61 20 63 61 73 65 |  In suc|h a case|
|00000310| 2c 20 73 65 74 20 65 64 | 69 66 66 2d 73 68 65 6c |, set ed|iff-shel|
|00000320| 6c 0a 74 6f 20 61 20 73 | 68 65 6c 6c 20 74 68 61 |l.to a s|hell tha|
|00000330| 74 20 79 6f 75 20 61 72 | 65 20 6e 6f 74 20 75 73 |t you ar|e not us|
|00000340| 69 6e 67 20 6f 72 2c 20 | 62 65 74 74 65 72 2c 20 |ing or, |better, |
|00000350| 66 69 78 20 79 6f 75 72 | 20 73 68 65 6c 6c 27 73 |fix your| shell's|
|00000360| 20 73 74 61 72 74 75 70 | 20 66 69 6c 65 2e 1f 0a | startup| file...|
|00000370| 28 64 65 66 76 61 72 20 | 65 64 69 66 66 2d 73 68 |(defvar |ediff-sh|
|00000380| 65 6c 6c 20 28 62 79 74 | 65 2d 63 6f 64 65 20 22 |ell (byt|e-code "|
|00000390| 08 c1 3d 83 08 00 c2 87 | 08 c3 3e 83 10 00 5c 66 |..=.....|..>...\f|
|000003a0| 87 08 c5 3e 83 18 00 c6 | 87 c7 87 22 20 5b 73 79 |...>....|..." [sy|
|000003b0| 73 74 65 6d 2d 74 79 70 | 65 20 65 6d 78 20 22 63 |stem-typ|e emx "c|
|000003c0| 6d 64 22 20 28 6d 73 2d | 64 6f 73 20 77 69 6e 64 |md" (ms-|dos wind|
|000003d0| 6f 77 73 2d 6e 74 20 77 | 69 6e 64 6f 77 73 2d 39 |ows-nt w|indows-9|
|000003e0| 35 29 20 73 68 65 6c 6c | 2d 66 69 6c 65 2d 6e 61 |5) shell|-file-na|
|000003f0| 6d 65 20 28 76 61 78 2d | 76 6d 73 20 61 78 70 2d |me (vax-|vms axp-|
|00000400| 76 6d 73 29 20 22 2a 64 | 63 6c 2a 22 20 22 73 68 |vms) "*d|cl*" "sh|
|00000410| 22 5d 20 32 29 20 28 23 | 24 20 2e 20 2d 35 31 34 |"] 2) (#|$ . -514|
|00000420| 29 29 0a 23 40 36 37 20 | 2a 50 72 6f 67 72 61 6d |)).#@67 |*Program|
|00000430| 20 74 6f 20 75 73 65 20 | 66 6f 72 20 67 65 6e 65 | to use |for gene|
|00000440| 72 61 74 69 6e 67 20 74 | 68 65 20 64 69 66 66 65 |rating t|he diffe|
|00000450| 72 65 6e 74 69 61 6c 20 | 6f 66 20 74 68 65 20 74 |rential |of the t|
|00000460| 77 6f 20 66 69 6c 65 73 | 2e 1f 0a 28 64 65 66 76 |wo files|...(defv|
|00000470| 61 72 20 65 64 69 66 66 | 2d 64 69 66 66 2d 70 72 |ar ediff|-diff-pr|
|00000480| 6f 67 72 61 6d 20 22 64 | 69 66 66 22 20 28 23 24 |ogram "d|iff" (#$|
|00000490| 20 2e 20 2d 31 30 36 34 | 29 29 0a 23 40 32 37 33 | . -1064|)).#@273|
|000004a0| 20 2a 4f 70 74 69 6f 6e | 73 20 74 6f 20 70 61 73 | *Option|s to pas|
|000004b0| 73 20 74 6f 20 60 65 64 | 69 66 66 2d 64 69 66 66 |s to `ed|iff-diff|
|000004c0| 2d 70 72 6f 67 72 61 6d | 27 2e 20 0a 49 66 20 64 |-program|'. .If d|
|000004d0| 69 66 66 28 31 29 20 69 | 73 20 75 73 65 64 20 61 |iff(1) i|s used a|
|000004e0| 73 20 60 65 64 69 66 66 | 2d 64 69 66 66 2d 70 72 |s `ediff|-diff-pr|
|000004f0| 6f 67 72 61 6d 27 2c 20 | 74 68 65 6e 20 74 68 65 |ogram', |then the|
|00000500| 20 6d 6f 73 74 20 75 73 | 65 66 75 6c 20 6f 70 74 | most us|eful opt|
|00000510| 69 6f 6e 73 20 61 72 65 | 0a 60 2d 77 27 2c 20 74 |ions are|.`-w', t|
|00000520| 6f 20 69 67 6e 6f 72 65 | 20 73 70 61 63 65 2c 20 |o ignore| space, |
|00000530| 61 6e 64 20 60 2d 69 27 | 2c 20 74 6f 20 69 67 6e |and `-i'|, to ign|
|00000540| 6f 72 65 20 63 61 73 65 | 20 6f 66 20 6c 65 74 74 |ore case| of lett|
|00000550| 65 72 73 2e 0a 41 74 20 | 70 72 65 73 65 6e 74 2c |ers..At |present,|
|00000560| 20 74 68 65 20 6f 70 74 | 69 6f 6e 20 60 2d 63 27 | the opt|ion `-c'|
|00000570| 20 69 73 20 69 67 6e 6f | 72 65 64 2c 20 73 69 6e | is igno|red, sin|
|00000580| 63 65 20 45 64 69 66 66 | 20 64 6f 65 73 6e 27 74 |ce Ediff| doesn't|
|00000590| 20 75 6e 64 65 72 73 74 | 61 6e 64 20 74 68 69 73 | underst|and this|
|000005a0| 0a 74 79 70 65 20 6f 66 | 20 6f 75 74 70 75 74 2e |.type of| output.|
|000005b0| 1f 0a 28 64 65 66 76 61 | 72 20 65 64 69 66 66 2d |..(defva|r ediff-|
|000005c0| 64 69 66 66 2d 6f 70 74 | 69 6f 6e 73 20 22 22 20 |diff-opt|ions "" |
|000005d0| 28 23 24 20 2e 20 2d 31 | 31 38 35 29 29 0a 23 40 |(#$ . -1|185)).#@|
|000005e0| 31 32 31 20 2a 50 72 6f | 67 72 61 6d 20 74 6f 20 |121 *Pro|gram to |
|000005f0| 75 73 65 20 66 6f 72 20 | 67 65 6e 65 72 61 74 69 |use for |generati|
|00000600| 6e 67 20 63 75 73 74 6f | 6d 20 64 69 66 66 20 6f |ng custo|m diff o|
|00000610| 75 74 70 75 74 20 66 6f | 72 20 73 61 76 69 6e 67 |utput fo|r saving|
|00000620| 20 69 74 20 69 6e 20 61 | 20 66 69 6c 65 2e 0a 54 | it in a| file..T|
|00000630| 68 69 73 20 6f 75 74 70 | 75 74 20 69 73 20 6e 6f |his outp|ut is no|
|00000640| 74 20 75 73 65 64 20 62 | 79 20 45 64 69 66 66 20 |t used b|y Ediff |
|00000650| 69 6e 74 65 72 6e 61 6c | 6c 79 2e 1f 0a 28 64 65 |internal|ly...(de|
|00000660| 66 76 61 72 20 65 64 69 | 66 66 2d 63 75 73 74 6f |fvar edi|ff-custo|
|00000670| 6d 2d 64 69 66 66 2d 70 | 72 6f 67 72 61 6d 20 65 |m-diff-p|rogram e|
|00000680| 64 69 66 66 2d 64 69 66 | 66 2d 70 72 6f 67 72 61 |diff-dif|f-progra|
|00000690| 6d 20 28 23 24 20 2e 20 | 2d 31 35 30 38 29 29 0a |m (#$ . |-1508)).|
|000006a0| 23 40 35 30 20 2a 4f 70 | 74 69 6f 6e 73 20 74 6f |#@50 *Op|tions to|
|000006b0| 20 70 61 73 73 20 74 6f | 20 60 65 64 69 66 66 2d | pass to| `ediff-|
|000006c0| 63 75 73 74 6f 6d 2d 64 | 69 66 66 2d 70 72 6f 67 |custom-d|iff-prog|
|000006d0| 72 61 6d 27 2e 1f 0a 28 | 64 65 66 76 61 72 20 65 |ram'...(|defvar e|
|000006e0| 64 69 66 66 2d 63 75 73 | 74 6f 6d 2d 64 69 66 66 |diff-cus|tom-diff|
|000006f0| 2d 6f 70 74 69 6f 6e 73 | 20 22 2d 63 22 20 28 23 |-options| "-c" (#|
|00000700| 24 20 2e 20 2d 31 37 30 | 31 29 29 0a 23 40 36 39 |$ . -170|1)).#@69|
|00000710| 20 50 61 74 74 65 72 6e | 20 74 6f 20 6d 61 74 63 | Pattern| to matc|
|00000720| 68 20 6c 69 6e 65 73 20 | 70 72 6f 64 75 63 65 64 |h lines |produced|
|00000730| 20 62 79 20 64 69 66 66 | 33 20 74 68 61 74 20 64 | by diff|3 that d|
|00000740| 65 73 63 72 69 62 65 20 | 64 69 66 66 65 72 65 6e |escribe |differen|
|00000750| 63 65 73 2e 1f 0a 28 64 | 65 66 76 61 72 20 65 64 |ces...(d|efvar ed|
|00000760| 69 66 66 2d 6d 61 74 63 | 68 2d 64 69 66 66 33 2d |iff-matc|h-diff3-|
|00000770| 6c 69 6e 65 20 22 5e 3d | 3d 3d 3d 5c 5c 28 2e 3f |line "^=|===\\(.?|
|00000780| 5c 5c 29 24 22 20 28 23 | 24 20 2e 20 31 38 30 39 |\\)$" (#|$ . 1809|
|00000790| 29 29 0a 23 40 31 30 35 | 20 2a 50 72 6f 67 72 61 |)).#@105| *Progra|
|000007a0| 6d 20 74 6f 20 62 65 20 | 75 73 65 64 20 66 6f 72 |m to be |used for|
|000007b0| 20 74 68 72 65 65 2d 77 | 61 79 20 63 6f 6d 70 61 | three-w|ay compa|
|000007c0| 72 69 73 6f 6e 2e 0a 4d | 75 73 74 20 70 72 6f 64 |rison..M|ust prod|
|000007d0| 75 63 65 20 6f 75 74 70 | 75 74 20 63 6f 6d 70 61 |uce outp|ut compa|
|000007e0| 74 69 62 6c 65 20 77 69 | 74 68 20 55 6e 69 78 27 |tible wi|th Unix'|
|000007f0| 73 20 64 69 66 66 33 20 | 70 72 6f 67 72 61 6d 2e |s diff3 |program.|
|00000800| 1f 0a 28 64 65 66 76 61 | 72 20 65 64 69 66 66 2d |..(defva|r ediff-|
|00000810| 64 69 66 66 33 2d 70 72 | 6f 67 72 61 6d 20 22 64 |diff3-pr|ogram "d|
|00000820| 69 66 66 33 22 20 28 23 | 24 20 2e 20 2d 31 39 34 |iff3" (#|$ . -194|
|00000830| 35 29 29 0a 23 40 34 34 | 20 2a 4f 70 74 69 6f 6e |5)).#@44| *Option|
|00000840| 73 20 74 6f 20 70 61 73 | 73 20 74 6f 20 60 65 64 |s to pas|s to `ed|
|00000850| 69 66 66 2d 64 69 66 66 | 33 2d 70 72 6f 67 72 61 |iff-diff|3-progra|
|00000860| 6d 27 2e 1f 0a 28 64 65 | 66 76 61 72 20 65 64 69 |m'...(de|fvar edi|
|00000870| 66 66 2d 64 69 66 66 33 | 2d 6f 70 74 69 6f 6e 73 |ff-diff3|-options|
|00000880| 20 22 22 20 28 23 24 20 | 2e 20 2d 32 31 30 35 29 | "" (#$ |. -2105)|
|00000890| 29 0a 23 40 31 32 38 20 | 2a 52 65 67 65 78 70 20 |).#@128 |*Regexp |
|000008a0| 74 68 61 74 20 6d 61 74 | 63 68 65 73 20 6e 6f 72 |that mat|ches nor|
|000008b0| 6d 61 6c 20 6f 75 74 70 | 75 74 20 6c 69 6e 65 73 |mal outp|ut lines|
|000008c0| 20 66 72 6f 6d 20 60 65 | 64 69 66 66 2d 64 69 66 | from `e|diff-dif|
|000008d0| 66 33 2d 70 72 6f 67 72 | 61 6d 27 2e 0a 4c 69 6e |f3-progr|am'..Lin|
|000008e0| 65 73 20 74 68 61 74 20 | 64 6f 20 6e 6f 74 20 6d |es that |do not m|
|000008f0| 61 74 63 68 20 61 72 65 | 20 61 73 73 75 6d 65 64 |atch are| assumed|
|00000900| 20 74 6f 20 62 65 20 65 | 72 72 6f 72 20 6d 65 73 | to be e|rror mes|
|00000910| 73 61 67 65 73 2e 1f 0a | 28 64 65 66 76 61 72 20 |sages...|(defvar |
|00000920| 65 64 69 66 66 2d 64 69 | 66 66 33 2d 6f 6b 2d 6c |ediff-di|ff3-ok-l|
|00000930| 69 6e 65 73 2d 72 65 67 | 65 78 70 20 22 5e 5c 5c |ines-reg|exp "^\\|
|00000940| 28 5b 31 2d 33 5d 3a 5c | 5c 7c 3d 3d 3d 3d 5c 5c |([1-3]:\|\|====\\|
|00000950| 7c 20 20 5c 5c 7c 2e 2a | 57 61 72 6e 69 6e 67 20 ||  \\|.*|Warning |
|00000960| 2a 3a 5c 5c 7c 2e 2a 4e | 6f 20 6e 65 77 6c 69 6e |*:\\|.*N|o newlin|
|00000970| 65 5c 5c 7c 2e 2a 6d 69 | 73 73 69 6e 67 20 6e 65 |e\\|.*mi|ssing ne|
|00000980| 77 6c 69 6e 65 5c 5c 7c | 5e 0d 24 5c 5c 29 22 20 |wline\\||^.$\\)" |
|00000990| 28 23 24 20 2e 20 2d 32 | 32 30 30 29 29 0a 23 40 |(#$ . -2|200)).#@|
|000009a0| 32 20 1f 0a 28 64 65 66 | 76 61 72 20 65 64 69 66 |2 ..(def|var edif|
|000009b0| 66 2d 64 69 66 66 2d 73 | 74 61 74 75 73 20 22 22 |f-diff-s|tatus ""|
|000009c0| 20 28 23 24 20 2e 20 32 | 34 36 36 29 29 0a 28 62 | (#$ . 2|466)).(b|
|000009d0| 79 74 65 2d 63 6f 64 65 | 20 22 c0 c1 21 88 c2 c1 |yte-code| "..!...|
|000009e0| c3 c4 23 87 22 20 5b 6d | 61 6b 65 2d 76 61 72 69 |..#." [m|ake-vari|
|000009f0| 61 62 6c 65 2d 62 75 66 | 66 65 72 2d 6c 6f 63 61 |able-buf|fer-loca|
|00000a00| 6c 20 65 64 69 66 66 2d | 64 69 66 66 2d 73 74 61 |l ediff-|diff-sta|
|00000a10| 74 75 73 20 70 75 74 20 | 70 65 72 6d 61 6e 65 6e |tus put |permanen|
|00000a20| 74 2d 6c 6f 63 61 6c 20 | 74 5d 20 34 29 0a 23 40 |t-local |t] 4).#@|
|00000a30| 33 32 34 20 49 66 20 60 | 6f 6e 27 2c 20 45 64 69 |324 If `|on', Edi|
|00000a40| 66 66 20 61 75 74 6f 2d | 68 69 67 68 6c 69 67 68 |ff auto-|highligh|
|00000a50| 74 73 20 66 69 6e 65 20 | 64 69 66 66 73 20 66 6f |ts fine |diffs fo|
|00000a60| 72 20 74 68 65 20 63 75 | 72 72 65 6e 74 20 64 69 |r the cu|rrent di|
|00000a70| 66 66 20 72 65 67 69 6f | 6e 2e 0a 49 66 20 60 6f |ff regio|n..If `o|
|00000a80| 66 66 27 2c 20 61 75 74 | 6f 2d 68 69 67 68 6c 69 |ff', aut|o-highli|
|00000a90| 67 68 74 69 6e 67 20 69 | 73 20 6e 6f 74 20 75 73 |ghting i|s not us|
|00000aa0| 65 64 2e 20 49 66 20 60 | 6e 69 78 27 2c 20 6e 6f |ed. If `|nix', no|
|00000ab0| 20 66 69 6e 65 20 64 69 | 66 66 73 20 61 72 65 20 | fine di|ffs are |
|00000ac0| 73 68 6f 77 6e 0a 61 74 | 20 61 6c 6c 2c 20 75 6e |shown.at| all, un|
|00000ad0| 6c 65 73 73 20 74 68 65 | 20 75 73 65 72 20 66 6f |less the| user fo|
|00000ae0| 72 63 65 2d 72 65 66 69 | 6e 65 73 20 74 68 65 20 |rce-refi|nes the |
|00000af0| 72 65 67 69 6f 6e 20 62 | 79 20 68 69 74 74 69 6e |region b|y hittin|
|00000b00| 67 20 60 2a 27 2e 0a 0a | 54 68 69 73 20 76 61 72 |g `*'...|This var|
|00000b10| 69 61 62 6c 65 20 63 61 | 6e 20 62 65 20 73 65 74 |iable ca|n be set|
|00000b20| 20 65 69 74 68 65 72 20 | 69 6e 20 2e 65 6d 61 63 | either |in .emac|
|00000b30| 73 20 6f 72 20 74 6f 67 | 67 6c 65 64 20 69 6e 74 |s or tog|gled int|
|00000b40| 65 72 61 63 74 69 76 65 | 6c 79 2e 0a 55 73 65 20 |eractive|ly..Use |
|00000b50| 60 73 65 74 71 2d 64 65 | 66 61 75 6c 74 27 20 69 |`setq-de|fault' i|
|00000b60| 66 20 73 65 74 74 69 6e | 67 20 69 74 20 69 6e 20 |f settin|g it in |
|00000b70| 2e 65 6d 61 63 73 1f 0a | 28 64 65 66 76 61 72 20 |.emacs..|(defvar |
|00000b80| 65 64 69 66 66 2d 61 75 | 74 6f 2d 72 65 66 69 6e |ediff-au|to-refin|
|00000b90| 65 20 28 62 79 74 65 2d | 63 6f 64 65 20 22 c0 20 |e (byte-|code ". |
|00000ba0| 83 07 00 c1 87 c2 87 22 | 20 5b 65 64 69 66 66 2d |......."| [ediff-|
|00000bb0| 68 61 73 2d 66 61 63 65 | 2d 73 75 70 70 6f 72 74 |has-face|-support|
|00000bc0| 2d 70 20 6f 6e 20 6e 69 | 78 5d 20 31 29 20 28 23 |-p on ni|x] 1) (#|
|00000bd0| 24 20 2e 20 32 36 31 32 | 29 29 0a 28 62 79 74 65 |$ . 2612|)).(byte|
|00000be0| 2d 63 6f 64 65 20 22 c0 | c1 21 88 c2 c1 c3 c4 23 |-code ".|.!.....#|
|00000bf0| 87 22 20 5b 6d 61 6b 65 | 2d 76 61 72 69 61 62 6c |." [make|-variabl|
|00000c00| 65 2d 62 75 66 66 65 72 | 2d 6c 6f 63 61 6c 20 65 |e-buffer|-local e|
|00000c10| 64 69 66 66 2d 61 75 74 | 6f 2d 72 65 66 69 6e 65 |diff-aut|o-refine|
|00000c20| 20 70 75 74 20 70 65 72 | 6d 61 6e 65 6e 74 2d 6c | put per|manent-l|
|00000c30| 6f 63 61 6c 20 74 5d 20 | 34 29 0a 23 40 32 30 31 |ocal t] |4).#@201|
|00000c40| 20 2a 49 66 20 74 2c 20 | 73 6b 69 70 20 6f 76 65 | *If t, |skip ove|
|00000c50| 72 20 64 69 66 66 65 72 | 65 6e 63 65 20 72 65 67 |r differ|ence reg|
|00000c60| 69 6f 6e 73 20 74 68 61 | 74 20 64 69 66 66 65 72 |ions tha|t differ|
|00000c70| 20 6f 6e 6c 79 20 69 6e | 20 74 68 65 20 77 68 69 | only in| the whi|
|00000c80| 74 65 20 73 70 61 63 65 | 20 61 6e 64 20 6c 69 6e |te space| and lin|
|00000c90| 65 20 62 72 65 61 6b 73 | 2e 0a 54 68 69 73 20 76 |e breaks|..This v|
|00000ca0| 61 72 69 61 62 6c 65 20 | 63 61 6e 20 62 65 20 73 |ariable |can be s|
|00000cb0| 65 74 20 65 69 74 68 65 | 72 20 69 6e 20 2e 65 6d |et eithe|r in .em|
|00000cc0| 61 63 73 20 6f 72 20 74 | 6f 67 67 6c 65 64 20 69 |acs or t|oggled i|
|00000cd0| 6e 74 65 72 61 63 74 69 | 76 65 6c 79 2e 0a 55 73 |nteracti|vely..Us|
|00000ce0| 65 20 60 73 65 74 71 2d | 64 65 66 61 75 6c 74 27 |e `setq-|default'|
|00000cf0| 20 69 66 20 73 65 74 74 | 69 6e 67 20 69 74 20 69 | if sett|ing it i|
|00000d00| 6e 20 2e 65 6d 61 63 73 | 1f 0a 28 64 65 66 76 61 |n .emacs|..(defva|
|00000d10| 72 20 65 64 69 66 66 2d | 69 67 6e 6f 72 65 2d 73 |r ediff-|ignore-s|
|00000d20| 69 6d 69 6c 61 72 2d 72 | 65 67 69 6f 6e 73 20 6e |imilar-r|egions n|
|00000d30| 69 6c 20 28 23 24 20 2e | 20 2d 33 31 33 37 29 29 |il (#$ .| -3137))|
|00000d40| 0a 28 62 79 74 65 2d 63 | 6f 64 65 20 22 c0 c1 21 |.(byte-c|ode "..!|
|00000d50| 88 c2 c1 c3 c4 23 87 22 | 20 5b 6d 61 6b 65 2d 76 |.....#."| [make-v|
|00000d60| 61 72 69 61 62 6c 65 2d | 62 75 66 66 65 72 2d 6c |ariable-|buffer-l|
|00000d70| 6f 63 61 6c 20 65 64 69 | 66 66 2d 69 67 6e 6f 72 |ocal edi|ff-ignor|
|00000d80| 65 2d 73 69 6d 69 6c 61 | 72 2d 72 65 67 69 6f 6e |e-simila|r-region|
|00000d90| 73 20 70 75 74 20 70 65 | 72 6d 61 6e 65 6e 74 2d |s put pe|rmanent-|
|00000da0| 6c 6f 63 61 6c 20 74 5d | 20 34 29 0a 23 40 36 34 |local t]| 4).#@64|
|00000db0| 20 2a 41 75 74 6f 2d 72 | 65 66 69 6e 65 20 6f 6e | *Auto-r|efine on|
|00000dc0| 6c 79 20 74 68 65 20 72 | 65 67 69 6f 6e 73 20 6f |ly the r|egions o|
|00000dd0| 66 20 74 68 69 73 20 73 | 69 7a 65 20 28 69 6e 20 |f this s|ize (in |
|00000de0| 62 79 74 65 73 29 20 6f | 72 20 6c 65 73 73 2e 1f |bytes) o|r less..|
|00000df0| 0a 28 64 65 66 76 61 72 | 20 65 64 69 66 66 2d 61 |.(defvar| ediff-a|
|00000e00| 75 74 6f 2d 72 65 66 69 | 6e 65 2d 6c 69 6d 69 74 |uto-refi|ne-limit|
|00000e10| 20 31 34 30 30 20 28 23 | 24 20 2e 20 2d 33 35 30 | 1400 (#|$ . -350|
|00000e20| 35 29 29 0a 28 62 79 74 | 65 2d 63 6f 64 65 20 22 |5)).(byt|e-code "|
|00000e30| c0 c1 21 88 c2 c1 c3 c4 | 23 87 22 20 5b 6d 61 6b |..!.....|#." [mak|
|00000e40| 65 2d 76 61 72 69 61 62 | 6c 65 2d 62 75 66 66 65 |e-variab|le-buffe|
|00000e50| 72 2d 6c 6f 63 61 6c 20 | 65 64 69 66 66 2d 61 75 |r-local |ediff-au|
|00000e60| 74 6f 2d 72 65 66 69 6e | 65 2d 6c 69 6d 69 74 20 |to-refin|e-limit |
|00000e70| 70 75 74 20 70 65 72 6d | 61 6e 65 6e 74 2d 6c 6f |put perm|anent-lo|
|00000e80| 63 61 6c 20 74 5d 20 34 | 29 0a 23 40 32 36 30 20 |cal t] 4|).#@260 |
|00000e90| 52 65 67 65 78 70 20 74 | 68 61 74 20 6d 61 74 63 |Regexp t|hat matc|
|00000ea0| 68 65 73 20 6e 6f 72 6d | 61 6c 20 6f 75 74 70 75 |hes norm|al outpu|
|00000eb0| 74 20 6c 69 6e 65 73 20 | 66 72 6f 6d 20 60 65 64 |t lines |from `ed|
|00000ec0| 69 66 66 2d 64 69 66 66 | 2d 70 72 6f 67 72 61 6d |iff-diff|-program|
|00000ed0| 27 2e 0a 54 68 69 73 20 | 69 73 20 6d 6f 73 74 6c |'..This |is mostl|
|00000ee0| 79 20 6c 69 66 74 65 64 | 20 66 72 6f 6d 20 45 6d |y lifted| from Em|
|00000ef0| 65 72 67 65 2c 20 65 78 | 63 65 70 74 20 74 68 61 |erge, ex|cept tha|
|00000f00| 74 20 45 64 69 66 66 20 | 61 6c 73 6f 20 63 6f 6e |t Ediff |also con|
|00000f10| 73 69 64 65 72 73 0a 77 | 61 72 6e 69 6e 67 73 20 |siders.w|arnings |
|00000f20| 61 6e 64 20 60 4d 69 73 | 73 69 6e 67 20 6e 65 77 |and `Mis|sing new|
|00000f30| 6c 69 6e 65 27 2d 74 79 | 70 65 20 6d 65 73 73 61 |line'-ty|pe messa|
|00000f40| 67 65 73 20 74 6f 20 62 | 65 20 6e 6f 72 6d 61 6c |ges to b|e normal|
|00000f50| 20 6f 75 74 70 75 74 2e | 0a 4c 69 6e 65 73 20 74 | output.|.Lines t|
|00000f60| 68 61 74 20 64 6f 20 6e | 6f 74 20 6d 61 74 63 68 |hat do n|ot match|
|00000f70| 20 61 72 65 20 61 73 73 | 75 6d 65 64 20 74 6f 20 | are ass|umed to |
|00000f80| 62 65 20 65 72 72 6f 72 | 20 6d 65 73 73 61 67 65 |be error| message|
|00000f90| 73 2e 1f 0a 28 64 65 66 | 76 61 72 20 65 64 69 66 |s...(def|var edif|
|00000fa0| 66 2d 64 69 66 66 2d 6f | 6b 2d 6c 69 6e 65 73 2d |f-diff-o|k-lines-|
|00000fb0| 72 65 67 65 78 70 20 22 | 5e 5c 5c 28 5b 30 2d 39 |regexp "|^\\([0-9|
|00000fc0| 2c 5d 2b 5b 61 63 64 5d | 5b 30 2d 39 2c 5d 2b 24 |,]+[acd]|[0-9,]+$|
|00000fd0| 5c 5c 7c 5b 3c 3e 5d 20 | 5c 5c 7c 2d 2d 2d 5c 5c |\\|[<>] |\\|---\\|
|00000fe0| 7c 2e 2a 57 61 72 6e 69 | 6e 67 20 2a 3a 5c 5c 7c ||.*Warni|ng *:\\||
|00000ff0| 2e 2a 4e 6f 20 2b 6e 65 | 77 6c 69 6e 65 5c 5c 7c |.*No +ne|wline\\||
|00001000| 2e 2a 6d 69 73 73 69 6e | 67 20 2b 6e 65 77 6c 69 |.*missin|g +newli|
|00001010| 6e 65 5c 5c 7c 5e 0d 24 | 5c 5c 29 22 20 28 23 24 |ne\\|^.$|\\)" (#$|
|00001020| 20 2e 20 33 37 32 38 29 | 29 0a 23 40 36 38 20 50 | . 3728)|).#@68 P|
|00001030| 61 74 74 65 72 6e 20 74 | 6f 20 6d 61 74 63 68 20 |attern t|o match |
|00001040| 6c 69 6e 65 73 20 70 72 | 6f 64 75 63 65 64 20 62 |lines pr|oduced b|
|00001050| 79 20 64 69 66 66 20 74 | 68 61 74 20 64 65 73 63 |y diff t|hat desc|
|00001060| 72 69 62 65 20 64 69 66 | 66 65 72 65 6e 63 65 73 |ribe dif|ferences|
|00001070| 2e 1f 0a 28 64 65 66 76 | 61 72 20 65 64 69 66 66 |...(defv|ar ediff|
|00001080| 2d 6d 61 74 63 68 2d 64 | 69 66 66 2d 6c 69 6e 65 |-match-d|iff-line|
|00001090| 20 28 62 79 74 65 2d 63 | 6f 64 65 20 22 c0 19 c2 | (byte-c|ode "...|
|000010a0| 09 c3 09 c4 b0 05 29 87 | 22 20 5b 22 5c 5c 28 5b |......).|" ["\\([|
|000010b0| 30 2d 39 5d 2b 5c 5c 29 | 5c 5c 28 5c 5c 7c 2c 5c |0-9]+\\)|\\(\\|,\|
|000010c0| 5c 28 5b 30 2d 39 5d 2b | 5c 5c 29 5c 5c 29 22 20 |\([0-9]+|\\)\\)" |
|000010d0| 78 20 22 5e 22 20 22 5c | 5c 28 5b 61 63 64 5d 5c |x "^" "\|\([acd]\|
|000010e0| 5c 29 22 20 22 24 22 5d | 20 35 29 20 28 23 24 20 |\)" "$"]| 5) (#$ |
|000010f0| 2e 20 34 31 34 33 29 29 | 0a 23 40 34 30 32 20 76 |. 4143))|.#@402 v|
|00001100| 61 6c 75 65 20 69 73 20 | 61 20 66 75 6e 63 74 69 |alue is |a functi|
|00001110| 6f 6e 20 73 79 6d 62 6f | 6c 20 64 65 70 65 6e 64 |on symbo|l depend|
|00001120| 69 6e 67 20 6f 6e 20 74 | 68 65 20 6b 69 6e 64 20 |ing on t|he kind |
|00001130| 6f 66 20 6a 6f 62 20 69 | 73 20 74 6f 20 62 65 20 |of job i|s to be |
|00001140| 64 6f 6e 65 2e 0a 46 6f | 72 20 32 2d 77 61 79 20 |done..Fo|r 2-way |
|00001150| 6a 6f 62 73 20 61 6e 64 | 20 66 6f 72 20 65 64 69 |jobs and| for edi|
|00001160| 66 66 2d 6d 65 72 67 65 | 2c 20 69 74 20 73 68 6f |ff-merge|, it sho|
|00001170| 75 6c 64 20 62 65 20 60 | 65 64 69 66 66 2d 73 65 |uld be `|ediff-se|
|00001180| 74 75 70 2d 64 69 66 66 | 2d 72 65 67 69 6f 6e 73 |tup-diff|-regions|
|00001190| 27 2e 0a 46 6f 72 20 6a | 6f 62 73 20 72 65 71 75 |'..For j|obs requ|
|000011a0| 69 72 69 6e 67 20 64 69 | 66 66 33 2c 20 69 74 20 |iring di|ff3, it |
|000011b0| 73 68 6f 75 6c 64 20 62 | 65 20 60 65 64 69 66 66 |should b|e `ediff|
|000011c0| 2d 73 65 74 75 70 2d 64 | 69 66 66 2d 72 65 67 69 |-setup-d|iff-regi|
|000011d0| 6f 6e 73 33 27 2e 0a 0a | 54 68 65 20 66 75 6e 63 |ons3'...|The func|
|000011e0| 74 69 6f 6e 20 73 68 6f | 75 6c 64 20 74 61 6b 65 |tion sho|uld take|
|000011f0| 20 74 68 72 65 65 20 6d | 61 6e 64 61 74 6f 72 79 | three m|andatory|
|00001200| 20 61 72 67 75 6d 65 6e | 74 73 2c 20 66 69 6c 65 | argumen|ts, file|
|00001210| 2d 41 2c 20 66 69 6c 65 | 2d 42 2c 20 61 6e 64 0a |-A, file|-B, and.|
|00001220| 66 69 6c 65 2d 43 2e 20 | 49 74 20 6d 61 79 20 69 |file-C. |It may i|
|00001230| 67 6e 6f 72 65 20 66 69 | 6c 65 20 43 20 66 6f 72 |gnore fi|le C for|
|00001240| 20 64 69 66 66 32 20 6a | 6f 62 73 2e 20 49 74 20 | diff2 j|obs. It |
|00001250| 73 68 6f 75 6c 64 20 61 | 6c 73 6f 20 74 61 6b 65 |should a|lso take|
|00001260| 0a 6f 6e 65 20 6f 70 74 | 69 6f 6e 61 6c 20 61 72 |.one opt|ional ar|
|00001270| 67 75 6d 65 6e 74 73 2c | 20 64 69 66 66 2d 6e 75 |guments,| diff-nu|
|00001280| 6d 62 65 72 20 74 6f 20 | 72 65 66 69 6e 65 2e 1f |mber to |refine..|
|00001290| 0a 28 64 65 66 76 61 72 | 20 65 64 69 66 66 2d 73 |.(defvar| ediff-s|
|000012a0| 65 74 75 70 2d 64 69 66 | 66 2d 72 65 67 69 6f 6e |etup-dif|f-region|
|000012b0| 73 2d 66 75 6e 63 74 69 | 6f 6e 20 6e 69 6c 20 28 |s-functi|on nil (|
|000012c0| 23 24 20 2e 20 34 33 35 | 31 29 29 0a 28 62 79 74 |#$ . 435|1)).(byt|
|000012d0| 65 2d 63 6f 64 65 20 22 | c0 c1 21 88 c2 c1 c3 c4 |e-code "|..!.....|
|000012e0| 23 87 22 20 5b 6d 61 6b | 65 2d 76 61 72 69 61 62 |#." [mak|e-variab|
|000012f0| 6c 65 2d 62 75 66 66 65 | 72 2d 6c 6f 63 61 6c 20 |le-buffe|r-local |
|00001300| 65 64 69 66 66 2d 73 65 | 74 75 70 2d 64 69 66 66 |ediff-se|tup-diff|
|00001310| 2d 72 65 67 69 6f 6e 73 | 2d 66 75 6e 63 74 69 6f |-regions|-functio|
|00001320| 6e 20 70 75 74 20 70 65 | 72 6d 61 6e 65 6e 74 2d |n put pe|rmanent-|
|00001330| 6c 6f 63 61 6c 20 74 5d | 20 34 29 0a 28 64 65 66 |local t]| 4).(def|
|00001340| 61 6c 69 61 73 20 27 65 | 64 69 66 66 2d 73 65 74 |alias 'e|diff-set|
|00001350| 75 70 2d 64 69 66 66 2d | 72 65 67 69 6f 6e 73 20 |up-diff-|regions |
|00001360| 23 5b 28 66 69 6c 65 2d | 41 20 66 69 6c 65 2d 42 |#[(file-|A file-B|
|00001370| 20 66 69 6c 65 2d 43 29 | 20 22 08 83 12 00 c1 08 | file-C)| "......|
|00001380| 21 83 12 00 c2 c1 08 21 | 21 84 19 00 c3 c4 c5 c6 |!......!|!.......|
|00001390| 5c 22 21 10 c7 08 0e 08 | 0e 09 23 88 ca 0e 0b 08 |\"!.....|..#.....|
|000013a0| 5c 22 88 cc cd 08 0e 0e | 0e 0f 23 21 87 22 20 5b |\"......|..#!." [|
|000013b0| 65 64 69 66 66 2d 64 69 | 66 66 2d 62 75 66 66 65 |ediff-di|ff-buffe|
|000013c0| 72 20 67 65 74 2d 62 75 | 66 66 65 72 20 62 75 66 |r get-bu|ffer buf|
|000013d0| 66 65 72 2d 6e 61 6d 65 | 20 67 65 74 2d 62 75 66 |fer-name| get-buf|
|000013e0| 66 65 72 2d 63 72 65 61 | 74 65 20 65 64 69 66 66 |fer-crea|te ediff|
|000013f0| 2d 75 6e 69 71 75 65 2d | 62 75 66 66 65 72 2d 6e |-unique-|buffer-n|
|00001400| 61 6d 65 20 22 2a 65 64 | 69 66 66 2d 64 69 66 66 |ame "*ed|iff-diff|
|00001410| 22 20 22 2a 22 20 65 64 | 69 66 66 2d 6d 61 6b 65 |" "*" ed|iff-make|
|00001420| 2d 64 69 66 66 32 2d 62 | 75 66 66 65 72 20 66 69 |-diff2-b|uffer fi|
|00001430| 6c 65 2d 41 20 66 69 6c | 65 2d 42 20 65 64 69 66 |le-A fil|e-B edif|
|00001440| 66 2d 70 72 65 70 61 72 | 65 2d 65 72 72 6f 72 2d |f-prepar|e-error-|
|00001450| 6c 69 73 74 20 65 64 69 | 66 66 2d 64 69 66 66 2d |list edi|ff-diff-|
|00001460| 6f 6b 2d 6c 69 6e 65 73 | 2d 72 65 67 65 78 70 20 |ok-lines|-regexp |
|00001470| 65 64 69 66 66 2d 63 6f | 6e 76 65 72 74 2d 64 69 |ediff-co|nvert-di|
|00001480| 66 66 73 2d 74 6f 2d 6f | 76 65 72 6c 61 79 73 20 |ffs-to-o|verlays |
|00001490| 65 64 69 66 66 2d 65 78 | 74 72 61 63 74 2d 64 69 |ediff-ex|tract-di|
|000014a0| 66 66 73 20 65 64 69 66 | 66 2d 77 6f 72 64 2d 6d |ffs edif|f-word-m|
|000014b0| 6f 64 65 20 65 64 69 66 | 66 2d 6e 61 72 72 6f 77 |ode edif|f-narrow|
|000014c0| 2d 62 6f 75 6e 64 73 5d | 20 35 5d 29 0a 28 64 65 |-bounds]| 5]).(de|
|000014d0| 66 61 6c 69 61 73 20 27 | 65 64 69 66 66 2d 6d 61 |falias '|ediff-ma|
|000014e0| 6b 65 2d 64 69 66 66 32 | 2d 62 75 66 66 65 72 20 |ke-diff2|-buffer |
|000014f0| 23 5b 28 64 69 66 66 2d | 62 75 66 66 65 72 20 66 |#[(diff-|buffer f|
|00001500| 69 6c 65 31 20 66 69 6c | 65 32 29 20 22 08 19 c2 |ile1 fil|e2) "...|
|00001510| 09 c3 5c 22 29 c4 57 83 | 19 00 c5 c6 c7 08 21 5c |..\").W.|......!\|
|00001520| 22 88 c8 c9 21 88 ca 87 | 0e 0b 19 c2 09 c3 5c 22 |"...!...|......\"|
|00001530| 29 c4 57 83 38 00 c5 cc | c7 0e 0b 21 5c 22 88 c8 |).W.8...|...!\"..|
|00001540| c9 21 88 c5 cd 21 88 ca | 87 c5 ce cf 08 21 cf 0e |.!...!..|.....!..|
|00001550| 0b 21 23 88 d0 0e 11 0e | 12 d3 0e 14 08 0e 0b 26 |.!#.....|.......&|
|00001560| 06 88 c5 cd 21 88 70 1e | 15 0e 12 83 79 00 d6 0e |....!.p.|....y...|
|00001570| 12 21 83 79 00 d7 d6 0e | 12 21 21 83 79 00 d8 8e |.!.y....|.!!.y...|
|00001580| 0e 12 71 88 d9 20 29 82 | 84 00 0e 1a db 3d 86 84 |..q.. ).|.....=..|
|00001590| 00 dc 0e 1d 21 29 87 22 | 20 5b 66 69 6c 65 31 20 |....!)."| [file1 |
|000015a0| 66 69 6c 65 6e 61 6d 65 | 20 65 64 69 66 66 2d 66 |filename| ediff-f|
|000015b0| 69 6c 65 2d 61 74 74 72 | 69 62 75 74 65 73 20 37 |ile-attr|ibutes 7|
|000015c0| 20 30 20 6d 65 73 73 61 | 67 65 20 22 43 61 6e 27 | 0 messa|ge "Can'|
|000015d0| 74 20 64 69 66 66 20 72 | 65 6d 6f 74 65 20 66 69 |t diff r|emote fi|
|000015e0| 6c 65 73 3a 20 25 73 22 | 20 65 64 69 66 66 2d 61 |les: %s"| ediff-a|
|000015f0| 62 62 72 65 76 69 61 74 | 65 2d 66 69 6c 65 2d 6e |bbreviat|e-file-n|
|00001600| 61 6d 65 20 73 69 74 2d | 66 6f 72 20 32 20 31 20 |ame sit-|for 2 1 |
|00001610| 66 69 6c 65 32 20 22 43 | 61 6e 27 74 20 64 69 66 |file2 "C|an't dif|
|00001620| 66 20 72 65 6d 6f 74 65 | 20 66 69 6c 65 3a 20 25 |f remote| file: %|
|00001630| 73 22 20 22 22 20 22 43 | 6f 6d 70 75 74 69 6e 67 |s" "" "C|omputing|
|00001640| 20 64 69 66 66 65 72 65 | 6e 63 65 73 20 62 65 74 | differe|nces bet|
|00001650| 77 65 65 6e 20 25 73 20 | 61 6e 64 20 25 73 20 2e |ween %s |and %s .|
|00001660| 2e 2e 22 20 66 69 6c 65 | 2d 6e 61 6d 65 2d 6e 6f |.." file|-name-no|
|00001670| 6e 64 69 72 65 63 74 6f | 72 79 20 65 64 69 66 66 |ndirecto|ry ediff|
|00001680| 2d 65 78 65 63 2d 70 72 | 6f 63 65 73 73 20 65 64 |-exec-pr|ocess ed|
|00001690| 69 66 66 2d 64 69 66 66 | 2d 70 72 6f 67 72 61 6d |iff-diff|-program|
|000016a0| 20 64 69 66 66 2d 62 75 | 66 66 65 72 20 73 79 6e | diff-bu|ffer syn|
|000016b0| 63 68 72 6f 6e 69 7a 65 | 20 65 64 69 66 66 2d 64 |chronize| ediff-d|
|000016c0| 69 66 66 2d 6f 70 74 69 | 6f 6e 73 20 53 74 61 72 |iff-opti|ons Star|
|000016d0| 74 42 75 66 66 65 72 20 | 67 65 74 2d 62 75 66 66 |tBuffer |get-buff|
|000016e0| 65 72 20 62 75 66 66 65 | 72 2d 6e 61 6d 65 20 28 |er buffe|r-name (|
|000016f0| 28 73 65 74 2d 62 75 66 | 66 65 72 20 53 74 61 72 |(set-buf|fer Star|
|00001700| 74 42 75 66 66 65 72 29 | 29 20 62 75 66 66 65 72 |tBuffer)|) buffer|
|00001710| 2d 73 69 7a 65 20 74 68 | 69 73 2d 63 6f 6d 6d 61 |-size th|is-comma|
|00001720| 6e 64 20 65 64 69 66 66 | 2d 71 75 69 74 20 65 72 |nd ediff|-quit er|
|00001730| 72 6f 72 20 65 64 69 66 | 66 2d 4b 49 4c 4c 45 44 |ror edif|f-KILLED|
|00001740| 2d 56 49 54 41 4c 2d 42 | 55 46 46 45 52 5d 20 37 |-VITAL-B|UFFER] 7|
|00001750| 5d 29 0a 28 64 65 66 61 | 6c 69 61 73 20 27 65 64 |]).(defa|lias 'ed|
|00001760| 69 66 66 2d 73 65 74 75 | 70 2d 66 69 6e 65 2d 64 |iff-setu|p-fine-d|
|00001770| 69 66 66 2d 72 65 67 69 | 6f 6e 73 20 23 5b 28 66 |iff-regi|ons #[(f|
|00001780| 69 6c 65 2d 41 20 66 69 | 6c 65 2d 42 20 66 69 6c |ile-A fi|le-B fil|
|00001790| 65 2d 43 20 72 65 67 2d | 6e 75 6d 29 20 22 08 83 |e-C reg-|num) "..|
|000017a0| 12 00 c1 08 21 83 12 00 | c2 c1 08 21 21 84 19 00 |....!...|...!!...|
|000017b0| c3 c4 c5 c6 5c 22 21 10 | c7 89 89 89 89 1e 08 1e |....\"!.|........|
|000017c0| 09 1e 5c 6e 1e 0b 1e 5c | 66 0e 0d 89 16 5c 66 83 |..\n...\|f....\f.|
|000017d0| 35 00 0e 0e 82 37 00 0e | 0f 16 0b 0e 5c 66 83 43 |5....7..|....\f.C|
|000017e0| 00 0e 10 82 45 00 0e 11 | 16 5c 6e 0e 5c 66 83 51 |....E...|.\n.\f.Q|
|000017f0| 00 0e 12 82 53 00 0e 13 | 16 09 d4 0e 15 54 43 1e |....S...|.....TC.|
|00001800| 16 1e 17 0e 18 83 6b 00 | d9 da 0e 17 0e 16 23 88 |......k.|......#.|
|00001810| 2a db 0e 0b 08 dc 0e 5c | 6e 0e 1d 83 7d 00 0e 1d |*......\|n...}...|
|00001820| 82 7f 00 0e 1e 0e 1e 83 | 89 00 0e 1e 82 8b 00 0e |........|........|
|00001830| 1d 0e 5c 66 85 9c 00 0e | 1f 83 9a 00 0e 1f 82 9c |..\f....|........|
|00001840| 00 0e 1e 26 07 88 e0 0e | 09 08 5c 22 88 e1 c7 1e |...&....|..\"....|
|00001850| 16 1e 17 0e 18 83 b8 00 | d9 da 0e 17 0e 16 23 88 |........|......#.|
|00001860| 2a 0e 5c 66 83 c6 00 e2 | 08 e3 e4 23 82 ca 00 e5 |*.\f....|...#....|
|00001870| 08 e4 5c 22 16 08 0e 5c | 66 83 fb 00 0e 1d 84 e0 |..\"...\|f.......|
|00001880| 00 e6 e7 0e 08 41 5c 22 | 88 82 fb 00 0e 1e 84 ef |.....A\"|........|
|00001890| 00 e6 e8 0e 08 41 5c 22 | 88 82 fb 00 0e 1f 84 fb |.....A\"|........|
|000018a0| 00 e6 e9 0e 08 41 5c 22 | 88 0e 08 0e 15 1e 2a 1e |.....A\"|......*.|
|000018b0| 08 eb ec 0e 08 0e 2a 23 | 88 eb ed 0e 08 0e 2a 23 |......*#|......*#|
|000018c0| 88 0e 0d 85 1f 01 eb ee | 0e 08 0e 2a 23 2e 07 87 |........|...*#...|
|000018d0| 22 20 5b 65 64 69 66 66 | 2d 66 69 6e 65 2d 64 69 |" [ediff|-fine-di|
|000018e0| 66 66 2d 62 75 66 66 65 | 72 20 67 65 74 2d 62 75 |ff-buffe|r get-bu|
|000018f0| 66 66 65 72 20 62 75 66 | 66 65 72 2d 6e 61 6d 65 |ffer buf|fer-name|
|00001900| 20 67 65 74 2d 62 75 66 | 66 65 72 2d 63 72 65 61 | get-buf|fer-crea|
|00001910| 74 65 20 65 64 69 66 66 | 2d 75 6e 69 71 75 65 2d |te ediff|-unique-|
|00001920| 62 75 66 66 65 72 2d 6e | 61 6d 65 20 22 2a 65 64 |buffer-n|ame "*ed|
|00001930| 69 66 66 2d 66 69 6e 65 | 2d 64 69 66 66 22 20 22 |iff-fine|-diff" "|
|00001940| 2a 22 20 6e 69 6c 20 64 | 69 66 66 2d 6c 69 73 74 |*" nil d|iff-list|
|00001950| 20 6f 6b 2d 72 65 67 65 | 78 70 20 64 69 66 66 2d | ok-rege|xp diff-|
|00001960| 6f 70 74 69 6f 6e 73 20 | 64 69 66 66 2d 70 72 6f |options |diff-pro|
|00001970| 67 72 61 6d 20 64 69 66 | 66 33 2d 6a 6f 62 20 65 |gram dif|f3-job e|
|00001980| 64 69 66 66 2d 33 77 61 | 79 2d 6a 6f 62 20 65 64 |diff-3wa|y-job ed|
|00001990| 69 66 66 2d 64 69 66 66 | 33 2d 70 72 6f 67 72 61 |iff-diff|3-progra|
|000019a0| 6d 20 65 64 69 66 66 2d | 64 69 66 66 2d 70 72 6f |m ediff-|diff-pro|
|000019b0| 67 72 61 6d 20 65 64 69 | 66 66 2d 64 69 66 66 33 |gram edi|ff-diff3|
|000019c0| 2d 6f 70 74 69 6f 6e 73 | 20 65 64 69 66 66 2d 64 |-options| ediff-d|
|000019d0| 69 66 66 2d 6f 70 74 69 | 6f 6e 73 20 65 64 69 66 |iff-opti|ons edif|
|000019e0| 66 2d 64 69 66 66 33 2d | 6f 6b 2d 6c 69 6e 65 73 |f-diff3-|ok-lines|
|000019f0| 2d 72 65 67 65 78 70 20 | 65 64 69 66 66 2d 64 69 |-regexp |ediff-di|
|00001a00| 66 66 2d 6f 6b 2d 6c 69 | 6e 65 73 2d 72 65 67 65 |ff-ok-li|nes-rege|
|00001a10| 78 70 20 22 52 65 66 69 | 6e 69 6e 67 20 64 69 66 |xp "Refi|ning dif|
|00001a20| 66 65 72 65 6e 63 65 20 | 72 65 67 69 6f 6e 20 25 |ference |region %|
|00001a30| 64 20 2e 2e 2e 22 20 72 | 65 67 2d 6e 75 6d 20 61 |d ..." r|eg-num a|
|00001a40| 72 67 73 20 73 74 72 69 | 6e 67 20 65 64 69 66 66 |rgs stri|ng ediff|
|00001a50| 2d 76 65 72 62 6f 73 65 | 2d 70 20 61 70 70 6c 79 |-verbose|-p apply|
|00001a60| 20 6d 65 73 73 61 67 65 | 20 65 64 69 66 66 2d 65 | message| ediff-e|
|00001a70| 78 65 63 2d 70 72 6f 63 | 65 73 73 20 73 79 6e 63 |xec-proc|ess sync|
|00001a80| 68 72 6f 6e 69 7a 65 20 | 66 69 6c 65 2d 41 20 66 |hronize |file-A f|
|00001a90| 69 6c 65 2d 42 20 66 69 | 6c 65 2d 43 20 65 64 69 |ile-B fi|le-C edi|
|00001aa0| 66 66 2d 70 72 65 70 61 | 72 65 2d 65 72 72 6f 72 |ff-prepa|re-error|
|00001ab0| 2d 6c 69 73 74 20 22 22 | 20 65 64 69 66 66 2d 65 |-list ""| ediff-e|
|00001ac0| 78 74 72 61 63 74 2d 64 | 69 66 66 73 33 20 33 77 |xtract-d|iffs3 3w|
|00001ad0| 61 79 2d 63 6f 6d 70 61 | 72 69 73 6f 6e 20 77 6f |ay-compa|rison wo|
|00001ae0| 72 64 2d 6d 6f 64 65 20 | 65 64 69 66 66 2d 65 78 |rd-mode |ediff-ex|
|00001af0| 74 72 61 63 74 2d 64 69 | 66 66 73 20 6d 61 70 63 |tract-di|ffs mapc|
|00001b00| 61 72 20 23 5b 28 65 6c | 74 29 20 22 08 c1 c2 49 |ar #[(el|t) "...I|
|00001b10| 88 08 c3 c2 49 87 22 20 | 5b 65 6c 74 20 30 20 6e |....I." |[elt 0 n|
|00001b20| 69 6c 20 31 5d 20 33 5d | 20 23 5b 28 65 6c 74 29 |il 1] 3]| #[(elt)|
|00001b30| 20 22 08 c1 c2 49 88 08 | c3 c2 49 87 22 20 5b 65 | "...I..|..I." [e|
|00001b40| 6c 74 20 32 20 6e 69 6c | 20 33 5d 20 33 5d 20 23 |lt 2 nil| 3] 3] #|
|00001b50| 5b 28 65 6c 74 29 20 22 | 08 c1 c2 49 88 08 c3 c2 |[(elt) "|...I....|
|00001b60| 49 87 22 20 5b 65 6c 74 | 20 34 20 6e 69 6c 20 35 |I." [elt| 4 nil 5|
|00001b70| 5d 20 33 5d 20 72 65 67 | 69 6f 6e 2d 6e 75 6d 20 |] 3] reg|ion-num |
|00001b80| 65 64 69 66 66 2d 73 65 | 74 2d 66 69 6e 65 2d 6f |ediff-se|t-fine-o|
|00001b90| 76 65 72 6c 61 79 73 2d | 69 6e 2d 6f 6e 65 2d 62 |verlays-|in-one-b|
|00001ba0| 75 66 66 65 72 20 41 20 | 42 20 43 5d 20 39 5d 29 |uffer A |B C] 9])|
|00001bb0| 0a 28 64 65 66 61 6c 69 | 61 73 20 27 65 64 69 66 |.(defali|as 'edif|
|00001bc0| 66 2d 70 72 65 70 61 72 | 65 2d 65 72 72 6f 72 2d |f-prepar|e-error-|
|00001bd0| 6c 69 73 74 20 23 5b 28 | 6f 6b 2d 72 65 67 65 78 |list #[(|ok-regex|
|00001be0| 70 20 64 69 66 66 2d 62 | 75 66 66 29 20 22 08 83 |p diff-b|uff) "..|
|00001bf0| 12 00 c1 08 21 83 12 00 | c2 c1 08 21 21 84 19 00 |....!...|...!!...|
|00001c00| c3 c4 c5 c6 5c 22 21 10 | 70 1e 07 08 83 7f 00 c1 |....\"!.|p.......|
|00001c10| 08 21 83 7f 00 c2 c1 08 | 21 21 83 7f 00 c8 8e 08 |.!......|!!......|
|00001c20| 71 88 c9 20 88 70 1e 07 | 0e 5c 6e 83 5a 00 c1 0e |q.. .p..|.\n.Z...|
|00001c30| 5c 6e 21 83 5a 00 c2 c1 | 0e 5c 6e 21 21 83 5a 00 |\n!.Z...|.\n!!.Z.|
|00001c40| cb 8e 0e 5c 6e 71 88 cc | 20 29 82 65 00 0e 0d ce |...\nq..| ).e....|
|00001c50| 3d 86 65 00 cf 0e 10 21 | 29 63 88 65 62 88 d1 0e |=.e....!|)c.eb...|
|00001c60| 12 21 88 0e 13 d4 3e 83 | 7b 00 d1 d5 21 88 29 82 |.!....>.|{...!.).|
|00001c70| 8b 00 0e 0d ce 3d 84 8b | 00 cf 0e 10 21 88 29 70 |.....=..|....!.)p|
|00001c80| 1e 07 08 83 ac 00 c1 08 | 21 83 ac 00 c2 c1 08 21 |........|!......!|
|00001c90| 21 83 ac 00 d6 8e 08 71 | 88 d7 20 29 82 b7 00 0e |!......q|.. )....|
|00001ca0| 0d ce 3d 86 b7 00 cf 0e | 10 21 29 d8 55 3f 85 f3 |..=.....|.!).U?..|
|00001cb0| 00 0e 19 08 1e 1a 1e 1b | dc 20 88 dd 0e 1a 21 88 |........|. ....!.|
|00001cc0| 0e 1b 89 1e 1e 83 ec 00 | c1 0e 1e 21 83 ec 00 c2 |........|...!....|
|00001cd0| c1 0e 1e 21 21 83 ec 00 | df c1 0e 1e 21 21 88 29 |...!!...|....!!.)|
|00001ce0| cf e0 0e 5c 6e 5c 22 2a | 87 22 20 5b 65 64 69 66 |...\n\"*|." [edif|
|00001cf0| 66 2d 65 72 72 6f 72 2d | 62 75 66 66 65 72 20 67 |f-error-|buffer g|
|00001d00| 65 74 2d 62 75 66 66 65 | 72 20 62 75 66 66 65 72 |et-buffe|r buffer|
|00001d10| 2d 6e 61 6d 65 20 67 65 | 74 2d 62 75 66 66 65 72 |-name ge|t-buffer|
|00001d20| 2d 63 72 65 61 74 65 20 | 65 64 69 66 66 2d 75 6e |-create |ediff-un|
|00001d30| 69 71 75 65 2d 62 75 66 | 66 65 72 2d 6e 61 6d 65 |ique-buf|fer-name|
|00001d40| 20 22 2a 65 64 69 66 66 | 2d 65 72 72 6f 72 73 22 | "*ediff|-errors"|
|00001d50| 20 22 2a 22 20 53 74 61 | 72 74 42 75 66 66 65 72 | "*" Sta|rtBuffer|
|00001d60| 20 28 28 73 65 74 2d 62 | 75 66 66 65 72 20 53 74 | ((set-b|uffer St|
|00001d70| 61 72 74 42 75 66 66 65 | 72 29 29 20 65 72 61 73 |artBuffe|r)) eras|
|00001d80| 65 2d 62 75 66 66 65 72 | 20 64 69 66 66 2d 62 75 |e-buffer| diff-bu|
|00001d90| 66 66 20 28 28 73 65 74 | 2d 62 75 66 66 65 72 20 |ff ((set|-buffer |
|00001da0| 53 74 61 72 74 42 75 66 | 66 65 72 29 29 20 62 75 |StartBuf|fer)) bu|
|00001db0| 66 66 65 72 2d 73 74 72 | 69 6e 67 20 74 68 69 73 |ffer-str|ing this|
|00001dc0| 2d 63 6f 6d 6d 61 6e 64 | 20 65 64 69 66 66 2d 71 |-command| ediff-q|
|00001dd0| 75 69 74 20 65 72 72 6f | 72 20 65 64 69 66 66 2d |uit erro|r ediff-|
|00001de0| 4b 49 4c 4c 45 44 2d 56 | 49 54 41 4c 2d 42 55 46 |KILLED-V|ITAL-BUF|
|00001df0| 46 45 52 20 64 65 6c 65 | 74 65 2d 6d 61 74 63 68 |FER dele|te-match|
|00001e00| 69 6e 67 2d 6c 69 6e 65 | 73 20 6f 6b 2d 72 65 67 |ing-line|s ok-reg|
|00001e10| 65 78 70 20 73 79 73 74 | 65 6d 2d 74 79 70 65 20 |exp syst|em-type |
|00001e20| 28 76 61 78 2d 76 6d 73 | 20 61 78 70 2d 76 6d 73 |(vax-vms| axp-vms|
|00001e30| 29 20 22 5e 24 22 20 28 | 28 73 65 74 2d 62 75 66 |) "^$" (|(set-buf|
|00001e40| 66 65 72 20 53 74 61 72 | 74 42 75 66 66 65 72 29 |fer Star|tBuffer)|
|00001e50| 29 20 62 75 66 66 65 72 | 2d 73 69 7a 65 20 30 20 |) buffer|-size 0 |
|00001e60| 65 64 69 66 66 2d 63 6f | 6e 74 72 6f 6c 2d 62 75 |ediff-co|ntrol-bu|
|00001e70| 66 66 65 72 20 65 72 72 | 6f 72 2d 62 75 66 20 63 |ffer err|or-buf c|
|00001e80| 74 6c 2d 62 75 66 20 65 | 64 69 66 66 2d 73 6b 69 |tl-buf e|diff-ski|
|00001e90| 70 2d 75 6e 73 75 69 74 | 61 62 6c 65 2d 66 72 61 |p-unsuit|able-fra|
|00001ea0| 6d 65 73 20 73 77 69 74 | 63 68 2d 74 6f 2d 62 75 |mes swit|ch-to-bu|
|00001eb0| 66 66 65 72 20 62 75 66 | 20 6b 69 6c 6c 2d 62 75 |ffer buf| kill-bu|
|00001ec0| 66 66 65 72 20 22 45 72 | 72 6f 72 73 20 69 6e 20 |ffer "Er|rors in |
|00001ed0| 64 69 66 66 20 6f 75 74 | 70 75 74 2e 20 44 69 66 |diff out|put. Dif|
|00001ee0| 66 20 6f 75 74 70 75 74 | 20 69 73 20 69 6e 20 25 |f output| is in %|
|00001ef0| 53 22 5d 20 35 5d 29 0a | 28 64 65 66 61 6c 69 61 |S"] 5]).|(defalia|
|00001f00| 73 20 27 65 64 69 66 66 | 2d 65 78 74 72 61 63 74 |s 'ediff|-extract|
|00001f10| 2d 64 69 66 66 73 20 23 | 5b 28 64 69 66 66 2d 62 |-diffs #|[(diff-b|
|00001f20| 75 66 66 65 72 20 77 6f | 72 64 2d 6d 6f 64 65 20 |uffer wo|rd-mode |
|00001f30| 26 6f 70 74 69 6f 6e 61 | 6c 20 62 6f 75 6e 64 73 |&optiona|l bounds|
|00001f40| 29 20 22 08 09 5c 6e c3 | 89 89 c4 89 89 1d 1e 06 |) "..\n.|........|
|00001f50| 1e 07 1e 08 1e 09 1e 5c | 6e 1e 0b 1e 5c 66 1e 0d |.......\|n...\f..|
|00001f60| 0e 0e 83 23 00 cf 82 24 | 00 d0 0e 07 42 16 07 0e |...#...$|....B...|
|00001f70| 11 83 3c 00 d2 0e 11 40 | 21 16 06 d2 0e 11 41 40 |..<....@|!.....A@|
|00001f80| 21 15 70 1e 13 0e 0d 83 | 6b 00 d4 0e 0d 21 83 6b |!.p.....|k....!.k|
|00001f90| 00 d5 d4 0e 0d 21 21 83 | 6b 00 d6 8e 0e 0d 71 88 |.....!!.|k.....q.|
|00001fa0| 0e 06 83 64 00 0e 06 82 | 65 00 65 62 88 29 82 77 |...d....|e.eb.).w|
|00001fb0| 00 0e 17 d8 3d 84 77 00 | d9 0e 1a 21 88 29 70 1e |....=.w.|...!.)p.|
|00001fc0| 13 0e 5c 66 83 a5 00 d4 | 0e 5c 66 21 83 a5 00 d5 |..\f....|.\f!....|
|00001fd0| d4 0e 5c 66 21 21 83 a5 | 00 db 8e 0e 5c 66 71 88 |..\f!!..|....\fq.|
|00001fe0| 0d 83 9e 00 0d 82 9f 00 | 65 62 88 29 82 b1 00 0e |........|eb.)....|
|00001ff0| 17 d8 3d 84 b1 00 d9 0e | 1a 21 88 29 0e 0b 83 f9 |..=.....|.!.)....|
|00002000| 00 d4 0e 0b 21 83 f9 00 | d5 d4 0e 0b 21 21 83 f9 |....!...|....!!..|
|00002010| 00 70 1e 13 0e 0b 83 ec | 00 d4 0e 0b 21 83 ec 00 |.p......|....!...|
|00002020| d5 d4 0e 0b 21 21 83 ec | 00 dc 8e 0e 0b 71 88 65 |....!!..|.....q.e|
|00002030| 62 88 29 82 f8 00 0e 17 | d8 3d 84 f8 00 d9 0e 1a |b.).....|.=......|
|00002040| 21 88 29 70 1e 13 0e 1d | 83 95 03 d4 0e 1d 21 83 |!.)p....|......!.|
|00002050| 95 03 d5 d4 0e 1d 21 21 | 83 95 03 de 8e 0e 1d 71 |......!!|.......q|
|00002060| 88 65 62 88 df 0e 20 c4 | e1 23 83 91 03 e2 c3 94 |.eb... .|.#......|
|00002070| c3 95 7b 21 1e 23 e4 94 | e4 95 1e 25 89 1e 26 83 |..{!.#..|...%..&.|
|00002080| 42 01 e2 0e 26 0e 25 7b | 21 82 44 01 0e 23 2a 1e |B...&.%{|!.D..#*.|
|00002090| 27 e8 94 e8 95 7b 1e 29 | e2 ea 94 ea 95 7b 21 1e |'....{.)|.....{!.|
|000020a0| 2b ec 94 ec 95 1e 25 89 | 1e 26 83 6d 01 e2 0e 26 |+.....%.|.&.m...&|
|000020b0| 0e 25 7b 21 82 6f 01 0e | 2b 2a 1e 2d c4 1e 2e c4 |.%{!.o..|+*.-....|
|000020c0| 1e 2f c4 1e 30 c4 1e 31 | c4 1e 32 c4 1e 33 c4 1e |./..0..1|..2..3..|
|000020d0| 34 c4 1e 35 0e 29 f6 98 | 83 a1 01 0e 2d 54 16 2d |4..5.)..|....-T.-|
|000020e0| 0e 23 54 89 16 23 16 27 | 82 c2 01 0e 29 f7 98 83 |.#T..#.'|....)...|
|000020f0| b8 01 0e 27 54 16 27 0e | 2b 54 89 16 2b 16 2d 82 |...'T.'.|+T..+.-.|
|00002100| c2 01 0e 27 54 16 27 0e | 2d 54 16 2d 0e 38 f9 3d |...'T.'.|-T.-.8.=|
|00002110| 83 d4 01 0e 2b 16 32 0e | 2d 16 33 82 dc 01 0e 23 |....+.2.|-.3....#|
|00002120| 16 32 0e 27 16 33 0e 0e | 83 52 02 0e 07 0e 0b 83 |.2.'.3..|.R......|
|00002130| 21 02 d4 0e 0b 21 83 21 | 02 d5 d4 0e 0b 21 21 83 |!....!.!|.....!!.|
|00002140| 21 02 fa 0e 23 0e 5c 6e | 5a 0e 27 0e 23 5a 0e 2b |!...#.\n|Z.'.#Z.+|
|00002150| 0e 09 5a 0e 2d 0e 2b 5a | 0e 32 0e 08 5a 0e 33 0e |..Z.-.+Z|.2..Z.3.|
|00002160| 32 5a c4 89 89 89 89 26 | 0b 82 3f 02 fa 0e 23 0e |2Z.....&|..?...#.|
|00002170| 5c 6e 5a 0e 27 0e 23 5a | 0e 2b 0e 09 5a 0e 2d 0e |\nZ.'.#Z|.+..Z.-.|
|00002180| 2b 5a c4 89 89 89 89 89 | 89 26 0b 43 a4 16 07 0e |+Z......|.&.C....|
|00002190| 27 16 5c 6e 0e 2d 16 09 | 0e 33 16 08 82 8c 03 70 |'.\n.-..|.3.....p|
|000021a0| 1e 13 0e 0d 83 8c 02 d4 | 0e 0d 21 83 8c 02 d5 d4 |........|..!.....|
|000021b0| 0e 0d 21 21 83 8c 02 fb | 8e 0e 0d 71 88 0e 23 0e |..!!....|...q..#.|
|000021c0| 5c 6e 5a 79 88 60 16 2e | 0e 27 0e 23 5a 79 88 60 |\nZy.`..|.'.#Zy.`|
|000021d0| 16 2f 0e 27 16 5c 6e 29 | 82 98 02 0e 17 d8 3d 84 |./.'.\n)|......=.|
|000021e0| 98 02 d9 0e 1a 21 88 29 | 70 1e 13 0e 5c 66 83 d3 |.....!.)|p...\f..|
|000021f0| 02 d4 0e 5c 66 21 83 d3 | 02 d5 d4 0e 5c 66 21 21 |...\f!..|....\f!!|
|00002200| 83 d3 02 fc 8e 0e 5c 66 | 71 88 0e 2b 0e 09 5a 79 |......\f|q..+..Zy|
|00002210| 88 60 16 30 0e 2d 0e 2b | 5a 79 88 60 16 31 0e 2d |.`.0.-.+|Zy.`.1.-|
|00002220| 16 09 29 82 df 02 0e 17 | d8 3d 84 df 02 d9 0e 1a |..).....|.=......|
|00002230| 21 88 29 0e 0b 83 3c 03 | d4 0e 0b 21 83 3c 03 d5 |!.)...<.|...!.<..|
|00002240| d4 0e 0b 21 21 83 3c 03 | 70 1e 13 0e 0b 83 2f 03 |...!!.<.|p...../.|
|00002250| d4 0e 0b 21 83 2f 03 d5 | d4 0e 0b 21 21 83 2f 03 |...!./..|...!!./.|
|00002260| fd 8e 0e 0b 71 88 0e 32 | 0e 08 5a 79 88 60 16 34 |....q..2|..Zy.`.4|
|00002270| 0e 33 0e 32 5a 79 88 60 | 16 35 0e 33 16 08 29 82 |.3.2Zy.`|.5.3..).|
|00002280| 3b 03 0e 17 d8 3d 84 3b | 03 d9 0e 1a 21 88 29 0e |;....=.;|....!.).|
|00002290| 07 0e 0b 83 76 03 d4 0e | 0b 21 83 76 03 d5 d4 0e |....v...|.!.v....|
|000022a0| 0b 21 21 83 76 03 fa 0e | 2e 0e 2f 0e 30 0e 31 0e |.!!.v...|../.0.1.|
|000022b0| 34 0e 35 c4 89 0e 38 f9 | 3d 83 6d 03 fe 82 6e 03 |4.5...8.|=.m...n.|
|000022c0| ff 0e 38 c4 26 0b 82 88 | 03 fa 0e 2e 0e 2f 0e 30 |..8.&...|...../.0|
|000022d0| 0e 31 c4 89 89 89 89 89 | 89 26 0b 43 a4 16 07 2e |.1......|.&.C....|
|000022e0| 0d 82 1a 01 29 82 a1 03 | 0e 17 d8 3d 84 a1 03 d9 |....)...|...=....|
|000022f0| 0e 1a 21 88 29 0e 07 2e | 09 87 22 20 5b 65 64 69 |..!.)...|.." [edi|
|00002300| 66 66 2d 62 75 66 66 65 | 72 2d 41 20 65 64 69 66 |ff-buffe|r-A edif|
|00002310| 66 2d 62 75 66 66 65 72 | 2d 42 20 65 64 69 66 66 |f-buffer|-B ediff|
|00002320| 2d 62 75 66 66 65 72 2d | 43 20 31 20 6e 69 6c 20 |-buffer-|C 1 nil |
|00002330| 73 68 69 66 74 2d 42 20 | 73 68 69 66 74 2d 41 20 |shift-B |shift-A |
|00002340| 64 69 66 66 2d 6c 69 73 | 74 20 63 2d 70 72 65 76 |diff-lis|t c-prev|
|00002350| 20 62 2d 70 72 65 76 20 | 61 2d 70 72 65 76 20 43 | b-prev |a-prev C|
|00002360| 2d 62 75 66 66 65 72 20 | 42 2d 62 75 66 66 65 72 |-buffer |B-buffer|
|00002370| 20 41 2d 62 75 66 66 65 | 72 20 77 6f 72 64 2d 6d | A-buffe|r word-m|
|00002380| 6f 64 65 20 77 6f 72 64 | 73 20 70 6f 69 6e 74 73 |ode word|s points|
|00002390| 20 62 6f 75 6e 64 73 20 | 65 64 69 66 66 2d 6f 76 | bounds |ediff-ov|
|000023a0| 65 72 6c 61 79 2d 73 74 | 61 72 74 20 53 74 61 72 |erlay-st|art Star|
|000023b0| 74 42 75 66 66 65 72 20 | 67 65 74 2d 62 75 66 66 |tBuffer |get-buff|
|000023c0| 65 72 20 62 75 66 66 65 | 72 2d 6e 61 6d 65 20 28 |er buffe|r-name (|
|000023d0| 28 73 65 74 2d 62 75 66 | 66 65 72 20 53 74 61 72 |(set-buf|fer Star|
|000023e0| 74 42 75 66 66 65 72 29 | 29 20 74 68 69 73 2d 63 |tBuffer)|) this-c|
|000023f0| 6f 6d 6d 61 6e 64 20 65 | 64 69 66 66 2d 71 75 69 |ommand e|diff-qui|
|00002400| 74 20 65 72 72 6f 72 20 | 65 64 69 66 66 2d 4b 49 |t error |ediff-KI|
|00002410| 4c 4c 45 44 2d 56 49 54 | 41 4c 2d 42 55 46 46 45 |LLED-VIT|AL-BUFFE|
|00002420| 52 20 28 28 73 65 74 2d | 62 75 66 66 65 72 20 53 |R ((set-|buffer S|
|00002430| 74 61 72 74 42 75 66 66 | 65 72 29 29 20 28 28 73 |tartBuff|er)) ((s|
|00002440| 65 74 2d 62 75 66 66 65 | 72 20 53 74 61 72 74 42 |et-buffe|r StartB|
|00002450| 75 66 66 65 72 29 29 20 | 64 69 66 66 2d 62 75 66 |uffer)) |diff-buf|
|00002460| 66 65 72 20 28 28 73 65 | 74 2d 62 75 66 66 65 72 |fer ((se|t-buffer|
|00002470| 20 53 74 61 72 74 42 75 | 66 66 65 72 29 29 20 72 | StartBu|ffer)) r|
|00002480| 65 2d 73 65 61 72 63 68 | 2d 66 6f 72 77 61 72 64 |e-search|-forward|
|00002490| 20 65 64 69 66 66 2d 6d | 61 74 63 68 2d 64 69 66 | ediff-m|atch-dif|
|000024a0| 66 2d 6c 69 6e 65 20 74 | 20 73 74 72 69 6e 67 2d |f-line t| string-|
|000024b0| 74 6f 2d 69 6e 74 20 61 | 2d 62 65 67 69 6e 20 33 |to-int a|-begin 3|
|000024c0| 20 65 20 62 20 61 2d 65 | 6e 64 20 34 20 64 69 66 | e b a-e|nd 4 dif|
|000024d0| 66 2d 74 79 70 65 20 35 | 20 62 2d 62 65 67 69 6e |f-type 5| b-begin|
|000024e0| 20 37 20 62 2d 65 6e 64 | 20 61 2d 62 65 67 69 6e | 7 b-end| a-begin|
|000024f0| 2d 70 74 20 61 2d 65 6e | 64 2d 70 74 20 62 2d 62 |-pt a-en|d-pt b-b|
|00002500| 65 67 69 6e 2d 70 74 20 | 62 2d 65 6e 64 2d 70 74 |egin-pt |b-end-pt|
|00002510| 20 63 2d 62 65 67 69 6e | 20 63 2d 65 6e 64 20 63 | c-begin| c-end c|
|00002520| 2d 62 65 67 69 6e 2d 70 | 74 20 63 2d 65 6e 64 2d |-begin-p|t c-end-|
|00002530| 70 74 20 22 61 22 20 22 | 64 22 20 65 64 69 66 66 |pt "a" "|d" ediff|
|00002540| 2d 64 65 66 61 75 6c 74 | 2d 76 61 72 69 61 6e 74 |-default|-variant|
|00002550| 20 64 65 66 61 75 6c 74 | 2d 42 20 76 65 63 74 6f | default|-B vecto|
|00002560| 72 20 28 28 73 65 74 2d | 62 75 66 66 65 72 20 53 |r ((set-|buffer S|
|00002570| 74 61 72 74 42 75 66 66 | 65 72 29 29 20 28 28 73 |tartBuff|er)) ((s|
|00002580| 65 74 2d 62 75 66 66 65 | 72 20 53 74 61 72 74 42 |et-buffe|r StartB|
|00002590| 75 66 66 65 72 29 29 20 | 28 28 73 65 74 2d 62 75 |uffer)) |((set-bu|
|000025a0| 66 66 65 72 20 53 74 61 | 72 74 42 75 66 66 65 72 |ffer Sta|rtBuffer|
|000025b0| 29 29 20 41 20 42 5d 20 | 31 34 5d 29 0a 28 64 65 |)) A B] |14]).(de|
|000025c0| 66 61 6c 69 61 73 20 27 | 65 64 69 66 66 2d 63 6f |falias '|ediff-co|
|000025d0| 6e 76 65 72 74 2d 64 69 | 66 66 73 2d 74 6f 2d 6f |nvert-di|ffs-to-o|
|000025e0| 76 65 72 6c 61 79 73 20 | 23 5b 28 64 69 66 66 2d |verlays |#[(diff-|
|000025f0| 6c 69 73 74 29 20 22 c0 | c1 5c 6e 5c 22 88 c0 c3 |list) ".|.\n\"...|
|00002600| 5c 6e 5c 22 88 5c 66 83 | 13 00 c0 c5 5c 6e 5c 22 |\n\".\f.|....\n\"|
|00002610| 88 0e 06 83 1d 00 c0 c7 | 5c 6e 5c 22 88 0e 08 83 |........|\n\"....|
|00002620| 2b 00 c9 ca cb 5c 6e 41 | 5c 22 21 16 5c 66 cd ce |+....\nA|\"!.\f..|
|00002630| 21 87 22 20 5b 65 64 69 | 66 66 2d 73 65 74 2d 64 |!." [edi|ff-set-d|
|00002640| 69 66 66 2d 6f 76 65 72 | 6c 61 79 73 2d 69 6e 2d |iff-over|lays-in-|
|00002650| 6f 6e 65 2d 62 75 66 66 | 65 72 20 41 20 64 69 66 |one-buff|er A dif|
|00002660| 66 2d 6c 69 73 74 20 42 | 20 65 64 69 66 66 2d 33 |f-list B| ediff-3|
|00002670| 77 61 79 2d 6a 6f 62 20 | 43 20 65 64 69 66 66 2d |way-job |C ediff-|
|00002680| 6d 65 72 67 65 2d 77 69 | 74 68 2d 61 6e 63 65 73 |merge-wi|th-ances|
|00002690| 74 6f 72 2d 6a 6f 62 20 | 41 6e 63 65 73 74 6f 72 |tor-job |Ancestor|
|000026a0| 20 65 64 69 66 66 2d 6d | 65 72 67 65 2d 6a 6f 62 | ediff-m|erge-job|
|000026b0| 20 76 63 6f 6e 63 61 74 | 20 6d 61 70 63 61 72 20 | vconcat| mapcar |
|000026c0| 23 5b 28 65 6c 74 29 20 | 22 08 c1 48 08 c2 48 1b |#[(elt) |"..H..H.|
|000026d0| 1c c5 5c 66 85 11 00 c6 | c7 5c 66 5c 22 0b 5c 22 |..\f....|.\f\".\"|
|000026e0| 2a 87 22 20 5b 65 6c 74 | 20 39 20 31 30 20 73 74 |*." [elt| 9 10 st|
|000026f0| 61 74 65 2d 6f 66 2d 61 | 6e 63 65 73 74 6f 72 20 |ate-of-a|ncestor |
|00002700| 73 74 61 74 65 2d 6f 66 | 2d 6d 65 72 67 65 20 76 |state-of|-merge v|
|00002710| 65 63 74 6f 72 20 66 6f | 72 6d 61 74 20 22 25 53 |ector fo|rmat "%S|
|00002720| 22 5d 20 34 5d 20 65 64 | 69 66 66 2d 73 74 61 74 |"] 4] ed|iff-stat|
|00002730| 65 2d 6f 66 2d 6d 65 72 | 67 65 20 6d 65 73 73 61 |e-of-mer|ge messa|
|00002740| 67 65 20 22 50 72 6f 63 | 65 73 73 69 6e 67 20 64 |ge "Proc|essing d|
|00002750| 69 66 66 65 72 65 6e 63 | 65 20 72 65 67 69 6f 6e |ifferenc|e region|
|00002760| 73 20 2e 2e 2e 20 64 6f | 6e 65 22 5d 20 34 5d 29 |s ... do|ne"] 4])|
|00002770| 0a 28 64 65 66 61 6c 69 | 61 73 20 27 65 64 69 66 |.(defali|as 'edif|
|00002780| 66 2d 73 65 74 2d 64 69 | 66 66 2d 6f 76 65 72 6c |f-set-di|ff-overl|
|00002790| 61 79 73 2d 69 6e 2d 6f | 6e 65 2d 62 75 66 66 65 |ays-in-o|ne-buffe|
|000027a0| 72 20 23 5b 28 62 75 66 | 2d 74 79 70 65 20 64 69 |r #[(buf|-type di|
|000027b0| 66 66 2d 6c 69 73 74 29 | 20 22 c0 19 5c 6e c3 3d |ff-list)| "..\n.=|
|000027c0| 83 5c 66 00 5c 66 82 2a | 00 5c 6e c5 3d 83 17 00 |.\f.\f.*|.\n.=...|
|000027d0| 0e 06 82 2a 00 5c 6e c7 | 3d 83 5c 22 00 0e 08 82 |...*.\n.|=.\"....|
|000027e0| 2a 00 5c 6e c9 3d 85 2a | 00 0e 5c 6e 1e 0b 0e 5c |*.\n.=.*|..\n...\|
|000027f0| 66 40 1e 0d ce 5c 6e c3 | 3d 83 3e 00 0e 0f 40 82 |f@...\n.|=.>...@.|
|00002800| 55 00 5c 6e c5 3d 83 4b | 00 0e 0f 41 40 82 55 00 |U.\n.=.K|...A@.U.|
|00002810| 5c 6e c7 3d 85 55 00 d0 | 0e 0f 38 21 1e 11 d2 5c |\n.=.U..|..8!...\|
|00002820| 6e c3 3d 83 65 00 0e 0f | 40 82 7c 00 5c 6e c5 3d |n.=.e...|@.|.\n.=|
|00002830| 83 72 00 0e 0f 41 40 82 | 7c 00 5c 6e c7 3d 85 7c |.r...A@.||.\n.=.||
|00002840| 00 d0 0e 0f 38 21 1e 13 | d4 1e 15 d4 1e 16 d4 1e |....8!..|........|
|00002850| 17 d4 1e 18 d4 1e 19 d4 | 1e 1a d4 1e 1b d4 1e 1c |........|........|
|00002860| 0e 5c 66 41 89 16 5c 66 | 47 16 17 70 1e 1d 0e 0b |.\fA..\f|G..p....|
|00002870| 83 c6 00 de 0e 0b 21 83 | c6 00 df de 0e 0b 21 21 |......!.|......!!|
|00002880| 83 c6 00 e0 8e 0e 0b 71 | 88 0e 11 16 1a 29 82 d2 |.......q|.....)..|
|00002890| 00 0e 21 e2 3d 84 d2 00 | e3 0e 24 21 88 29 0e 5c |..!.=...|..$!.).\|
|000028a0| 66 83 6f 02 09 54 11 0e | 5c 66 40 89 16 16 5c 6e |f.o..T..|\f@...\n|
|000028b0| c3 3d 83 eb 00 e5 82 00 | 01 5c 6e c5 3d 83 f5 00 |.=......|.\n.=...|
|000028c0| d0 82 00 01 5c 6e c7 3d | 83 ff 00 e6 82 00 01 e7 |....\n.=|........|
|000028d0| 48 16 18 0e 16 5c 6e c3 | 3d 83 0f 01 e8 82 24 01 |H....\n.|=.....$.|
|000028e0| 5c 6e c5 3d 83 19 01 e9 | 82 24 01 5c 6e c7 3d 83 |\n.=....|.$.\n.=.|
|000028f0| 23 01 ea 82 24 01 eb 48 | 16 19 0e 16 ec 48 16 1c |#...$..H|.....H..|
|00002900| 5c 6e 0e 1c 3d 84 59 01 | 5c 6e c9 3d 84 59 01 0e |\n..=.Y.|\n.=.Y..|
|00002910| 1c ed 3e 83 59 01 ee 5c | 6e ee 0e 1c c3 c5 c7 45 |..>.Y..\|n......E|
|00002920| 5c 22 5c 22 40 16 1c ef | f0 0e 1c 5c 22 16 1c 82 |\"\"@...|...\"...|
|00002930| 5c 5c 01 d4 16 1c 0e 0d | f1 3d 83 f0 01 70 1e 1d |\\......|.=...p..|
|00002940| 0e 0b 83 89 01 de 0e 0b | 21 83 89 01 df de 0e 0b |........|!.......|
|00002950| 21 21 83 89 01 f2 8e 0e | 0b 71 88 0e 1a 62 88 29 |!!......|.q...b.)|
|00002960| 82 95 01 0e 21 e2 3d 84 | 95 01 e3 0e 24 21 88 29 |....!.=.|....$!.)|
|00002970| f3 0e 18 54 0e 0b 5c 22 | 16 18 f3 0e 19 0e 0b d9 |...T..\"|........|
|00002980| 23 89 16 19 0e 13 56 83 | b3 01 0e 13 16 19 0e 18 |#.....V.|........|
|00002990| 0e 19 56 83 bf 01 0e 19 | 16 18 70 1e 1d 0e 0b 83 |..V.....|..p.....|
|000029a0| e2 01 de 0e 0b 21 83 e2 | 01 df de 0e 0b 21 21 83 |.....!..|.....!!.|
|000029b0| e2 01 f4 8e 0e 0b 71 88 | 60 29 82 ed 01 0e 21 e2 |......q.|`)....!.|
|000029c0| 3d 86 ed 01 e3 0e 24 21 | 29 16 1a f5 0e 18 0e 19 |=.....$!|).......|
|000029d0| 0e 0b 23 16 1b f6 0e 1b | f7 0e 38 23 88 f6 0e 1b |..#.....|..8#....|
|000029e0| f9 09 23 88 fa 20 83 3d | 02 0e 3b 83 3d 02 0e 3c |..#.. .=|..;.=..<|
|000029f0| 83 3d 02 fd 0e 1b 5c 6e | 09 1e 3e 1a ff ef 81 40 |.=....\n|..>....@|
|00002a00| 00 0e 3e e8 5c 22 e8 3d | 83 34 02 81 41 00 82 37 |..>.\".=|.4..A..7|
|00002a10| 02 81 42 00 5c 6e 5c 22 | 21 2a 5c 22 88 81 43 00 |..B.\n\"|!*\"..C.|
|00002a20| 09 81 44 00 5c 22 e5 55 | 83 56 02 81 45 00 81 46 |..D.\".U|.V..E..F|
|00002a30| 00 5c 6e 09 0e 17 24 88 | 0e 15 81 47 00 0e 1b d4 |.\n...$.|...G....|
|00002a40| 89 0e 1c 24 43 a4 16 15 | 0e 5c 66 41 89 16 5c 66 |...$C...|.\fA..\f|
|00002a50| 84 d8 00 ff ef 81 48 00 | 5c 6e 5c 22 21 81 49 00 |......H.|\n\"!.I.|
|00002a60| 0e 15 21 4c 2e 0d 87 22 | 20 5b 2d 31 20 63 75 72 |..!L..."| [-1 cur|
|00002a70| 72 65 6e 74 2d 64 69 66 | 66 20 62 75 66 2d 74 79 |rent-dif|f buf-ty|
|00002a80| 70 65 20 41 20 65 64 69 | 66 66 2d 62 75 66 66 65 |pe A edi|ff-buffe|
|00002a90| 72 2d 41 20 42 20 65 64 | 69 66 66 2d 62 75 66 66 |r-A B ed|iff-buff|
|00002aa0| 65 72 2d 42 20 43 20 65 | 64 69 66 66 2d 62 75 66 |er-B C e|diff-buf|
|00002ab0| 66 65 72 2d 43 20 41 6e | 63 65 73 74 6f 72 20 65 |fer-C An|cestor e|
|00002ac0| 64 69 66 66 2d 61 6e 63 | 65 73 74 6f 72 2d 62 75 |diff-anc|estor-bu|
|00002ad0| 66 66 65 72 20 62 75 66 | 66 20 64 69 66 66 2d 6c |ffer buf|f diff-l|
|00002ae0| 69 73 74 20 64 69 66 66 | 2d 6c 69 73 74 2d 74 79 |ist diff|-list-ty|
|00002af0| 70 65 20 65 64 69 66 66 | 2d 6f 76 65 72 6c 61 79 |pe ediff|-overlay|
|00002b00| 2d 73 74 61 72 74 20 65 | 64 69 66 66 2d 6e 61 72 |-start e|diff-nar|
|00002b10| 72 6f 77 2d 62 6f 75 6e | 64 73 20 32 20 73 68 69 |row-boun|ds 2 shi|
|00002b20| 66 74 20 65 64 69 66 66 | 2d 6f 76 65 72 6c 61 79 |ft ediff|-overlay|
|00002b30| 2d 65 6e 64 20 6c 69 6d | 69 74 20 6e 69 6c 20 64 |-end lim|it nil d|
|00002b40| 69 66 66 2d 6f 76 65 72 | 6c 61 79 2d 6c 69 73 74 |iff-over|lay-list|
|00002b50| 20 6c 69 73 74 2d 65 6c | 65 6d 65 6e 74 20 74 6f | list-el|ement to|
|00002b60| 74 61 6c 2d 64 69 66 66 | 73 20 62 65 67 69 6e 20 |tal-diff|s begin |
|00002b70| 65 6e 64 20 70 74 2d 73 | 61 76 65 64 20 6f 76 65 |end pt-s|aved ove|
|00002b80| 72 6c 61 79 20 73 74 61 | 74 65 2d 6f 66 2d 64 69 |rlay sta|te-of-di|
|00002b90| 66 66 20 53 74 61 72 74 | 42 75 66 66 65 72 20 67 |ff Start|Buffer g|
|00002ba0| 65 74 2d 62 75 66 66 65 | 72 20 62 75 66 66 65 72 |et-buffe|r buffer|
|00002bb0| 2d 6e 61 6d 65 20 28 28 | 73 65 74 2d 62 75 66 66 |-name ((|set-buff|
|00002bc0| 65 72 20 53 74 61 72 74 | 42 75 66 66 65 72 29 29 |er Start|Buffer))|
|00002bd0| 20 74 68 69 73 2d 63 6f | 6d 6d 61 6e 64 20 65 64 | this-co|mmand ed|
|00002be0| 69 66 66 2d 71 75 69 74 | 20 65 72 72 6f 72 20 65 |iff-quit| error e|
|00002bf0| 64 69 66 66 2d 4b 49 4c | 4c 45 44 2d 56 49 54 41 |diff-KIL|LED-VITA|
|00002c00| 4c 2d 42 55 46 46 45 52 | 20 30 20 34 20 36 20 31 |L-BUFFER| 0 4 6 1|
|00002c10| 20 33 20 35 20 37 20 38 | 20 28 41 20 42 20 43 29 | 3 5 7 8| (A B C)|
|00002c20| 20 64 65 6c 71 20 66 6f | 72 6d 61 74 20 22 3d 64 | delq fo|rmat "=d|
|00002c30| 69 66 66 28 25 53 29 22 | 20 77 6f 72 64 73 20 28 |iff(%S)"| words (|
|00002c40| 28 73 65 74 2d 62 75 66 | 66 65 72 20 53 74 61 72 |(set-buf|fer Star|
|00002c50| 74 42 75 66 66 65 72 29 | 29 20 65 64 69 66 66 2d |tBuffer)|) ediff-|
|00002c60| 67 6f 74 6f 2d 77 6f 72 | 64 20 28 28 73 65 74 2d |goto-wor|d ((set-|
|00002c70| 62 75 66 66 65 72 20 53 | 74 61 72 74 42 75 66 66 |buffer S|tartBuff|
|00002c80| 65 72 29 29 20 65 64 69 | 66 66 2d 6d 61 6b 65 2d |er)) edi|ff-make-|
|00002c90| 62 75 6c 6c 65 74 2d 70 | 72 6f 6f 66 2d 6f 76 65 |bullet-p|roof-ove|
|00002ca0| 72 6c 61 79 20 65 64 69 | 66 66 2d 6f 76 65 72 6c |rlay edi|ff-overl|
|00002cb0| 61 79 2d 70 75 74 20 70 | 72 69 6f 72 69 74 79 20 |ay-put p|riority |
|00002cc0| 65 64 69 66 66 2d 73 68 | 61 64 6f 77 2d 6f 76 65 |ediff-sh|adow-ove|
|00002cd0| 72 6c 61 79 2d 70 72 69 | 6f 72 69 74 79 20 65 64 |rlay-pri|ority ed|
|00002ce0| 69 66 66 2d 64 69 66 66 | 2d 6e 75 6d 20 65 64 69 |iff-diff|-num edi|
|00002cf0| 66 66 2d 68 61 73 2d 66 | 61 63 65 2d 73 75 70 70 |ff-has-f|ace-supp|
|00002d00| 6f 72 74 2d 70 20 65 64 | 69 66 66 2d 75 73 65 2d |ort-p ed|iff-use-|
|00002d10| 66 61 63 65 73 20 65 64 | 69 66 66 2d 68 69 67 68 |faces ed|iff-high|
|00002d20| 6c 69 67 68 74 2d 61 6c | 6c 2d 64 69 66 66 73 20 |light-al|l-diffs |
|00002d30| 65 64 69 66 66 2d 73 65 | 74 2d 6f 76 65 72 6c 61 |ediff-se|t-overla|
|00002d40| 79 2d 66 61 63 65 20 64 | 69 66 2d 6e 75 6d 20 69 |y-face d|if-num i|
|00002d50| 6e 74 65 72 6e 20 6c 6f | 67 61 6e 64 20 22 65 64 |ntern lo|gand "ed|
|00002d60| 69 66 66 2d 65 76 65 6e | 2d 64 69 66 66 2d 66 61 |iff-even|-diff-fa|
|00002d70| 63 65 2d 25 53 22 20 22 | 65 64 69 66 66 2d 6f 64 |ce-%S" "|ediff-od|
|00002d80| 64 2d 64 69 66 66 2d 66 | 61 63 65 2d 25 53 22 20 |d-diff-f|ace-%S" |
|00002d90| 6d 6f 64 20 31 30 20 6d | 65 73 73 61 67 65 20 22 |mod 10 m|essage "|
|00002da0| 42 75 66 66 65 72 20 25 | 53 3a 20 50 72 6f 63 65 |Buffer %|S: Proce|
|00002db0| 73 73 69 6e 67 20 64 69 | 66 66 65 72 65 6e 63 65 |ssing di|fference|
|00002dc0| 20 72 65 67 69 6f 6e 20 | 25 64 20 6f 66 20 25 64 | region |%d of %d|
|00002dd0| 22 20 76 65 63 74 6f 72 | 20 22 65 64 69 66 66 2d |" vector| "ediff-|
|00002de0| 64 69 66 66 65 72 65 6e | 63 65 2d 76 65 63 74 6f |differen|ce-vecto|
|00002df0| 72 2d 25 53 22 20 76 63 | 6f 6e 63 61 74 5d 20 38 |r-%S" vc|oncat] 8|
|00002e00| 5d 29 0a 28 64 65 66 61 | 6c 69 61 73 20 27 65 64 |]).(defa|lias 'ed|
|00002e10| 69 66 66 2d 6d 61 6b 65 | 2d 66 69 6e 65 2d 64 69 |iff-make|-fine-di|
|00002e20| 66 66 73 20 23 5b 28 26 | 6f 70 74 69 6f 6e 61 6c |ffs #[(&|optional|
|00002e30| 20 6e 20 66 6c 61 67 29 | 20 22 08 84 06 00 09 10 | n flag)| "......|
|00002e40| 5c 6e c3 57 83 10 00 c4 | 0d 21 88 0e 06 83 1b 00 |\n.W....|.!......|
|00002e50| c7 16 08 c9 16 5c 6e 08 | cb 57 86 1f 03 08 5c 6e |.....\n.|.W....\n|
|00002e60| 59 86 1f 03 cc 0e 0d 21 | 0e 0e 0e 0f 0e 10 d1 08 |Y......!|........|
|00002e70| d2 5c 22 d1 08 d3 5c 22 | d1 08 d4 5c 22 d5 08 d2 |.\"...\"|...\"...|
|00002e80| 5c 22 d5 08 d3 5c 22 d5 | 08 d4 5c 22 d6 1e 17 1e |\"...\".|..\"....|
|00002e90| 18 1e 19 1e 1a 1e 1b 1e | 1c 1e 1d 1e 1e 1e 1f 1e |........|........|
|00002ea0| 20 1e 21 0e 08 e2 3d 83 | 8c 00 e3 e4 e5 d2 5c 22 | .!...=.|......\"|
|00002eb0| 21 4a 08 48 c3 48 83 8c | 00 e3 e4 e5 d2 5c 22 21 |!J.H.H..|.....\"!|
|00002ec0| 4a 08 48 e6 48 83 18 03 | e7 e8 08 54 5c 22 88 82 |J.H.H...|...T\"..|
|00002ed0| 18 03 e9 d6 0e 1d 0e 1c | 0e 1b 45 5c 22 47 c3 56 |........|..E\"G.V|
|00002ee0| 83 41 01 ea 08 21 83 ad | 00 0e 2b 83 ad 00 ec d4 |.A...!..|..+.....|
|00002ef0| d6 08 23 88 0e 2d 83 e4 | 00 ee 08 54 0e 1d 84 be |..#..-..|...T....|
|00002f00| 00 d2 82 ce 00 0e 1c 84 | c7 00 d3 82 ce 00 0e 1b |........|........|
|00002f10| 3f 85 ce 00 d4 44 1e 2f | 1e 30 0e 31 83 e0 00 f2 |?....D./|.0.1....|
|00002f20| e7 0e 30 0e 2f 23 88 2a | 82 12 01 f3 08 54 0e 1d |..0./#.*|.....T..|
|00002f30| 83 f0 00 d2 82 ff 00 0e | 1c 83 f9 00 d3 82 ff 00 |........|........|
|00002f40| 0e 1b 85 ff 00 d4 44 1e | 2f 1e 30 0e 31 83 11 01 |......D.|/.0.1...|
|00002f50| f2 e7 0e 30 0e 2f 23 88 | 2a 0e 1a 83 31 01 0e 19 |...0./#.|*...1...|
|00002f60| 83 31 01 0e 18 83 31 01 | e3 e4 e5 d2 5c 22 21 4a |.1....1.|....\"!J|
|00002f70| 08 48 e6 f4 49 88 82 18 | 03 e3 e4 e5 d2 5c 22 21 |.H..I...|.....\"!|
|00002f80| 4a 08 48 e6 d6 49 88 82 | 18 03 0e 08 c7 3d 83 79 |J.H..I..|.....=.y|
|00002f90| 01 e3 e4 e5 d2 5c 22 21 | 4a 08 48 c3 48 84 18 03 |.....\"!|J.H.H...|
|00002fa0| 0e 5c 6e f5 3e 84 18 03 | f6 08 54 f7 f8 21 44 1e |.\n.>...|..T..!D.|
|00002fb0| 2f 1e 30 0e 31 83 75 01 | f2 e7 0e 30 0e 2f 23 88 |/.0.1.u.|...0./#.|
|00002fc0| 2a 82 18 03 f9 fa d2 fb | 08 23 fa d2 fc 08 23 0e |*.......|.#....#.|
|00002fd0| 3d 0e 21 0e 3e 25 88 ff | 0e 21 81 40 00 0e 20 23 |=.!.>%..|.!.@.. #|
|00002fe0| 16 20 f9 fa d3 fb 08 23 | fa d3 fc 08 23 0e 41 0e |. .....#|....#.A.|
|00002ff0| 21 0e 3e 25 88 ff 0e 21 | 81 42 00 0e 1f 23 16 1f |!.>%...!|.B...#..|
|00003000| 0e 43 83 d8 01 f9 fa d4 | fb 08 23 fa d4 fc 08 23 |.C......|..#....#|
|00003010| 0e 44 0e 21 0e 3e 25 88 | ff 0e 21 81 45 00 0e 1e |.D.!.>%.|..!.E...|
|00003020| 23 16 1e 0e 20 16 0e 0e | 1f 16 0f 0e 1e 16 10 0e |#... ...|........|
|00003030| 43 83 fc 01 0e 1a 83 fc | 01 81 46 00 d6 0e 1f 0e |C.......|..F.....|
|00003040| 1e 08 24 88 82 38 02 0e | 43 83 14 02 0e 19 83 14 |..$..8..|C.......|
|00003050| 02 81 46 00 0e 20 d6 0e | 1e 08 24 88 82 38 02 0e |..F.. ..|..$..8..|
|00003060| 43 83 2c 02 0e 18 83 2c | 02 81 46 00 0e 20 0e 1f |C.,....,|..F.. ..|
|00003070| d6 08 24 88 82 38 02 81 | 46 00 0e 20 0e 1f 0e 1e |..$..8..|F.. ....|
|00003080| 08 24 88 e3 e4 e5 d2 5c | 22 21 4a 08 48 c3 48 47 |.$.....\|"!J.H.HG|
|00003090| e3 e4 e5 d3 5c 22 21 4a | 08 48 c3 48 47 5c 5c 0e |....\"!J|.H.HG\\.|
|000030a0| 1e 83 6a 02 0e 2b 84 6a | 02 e3 e4 e5 d4 5c 22 21 |..j..+.j|.....\"!|
|000030b0| 4a 08 48 c3 48 47 82 6b | 02 cb 5c 5c 16 17 0e 1a |J.H.HG.k|..\\....|
|000030c0| 83 7d 02 0e 19 83 7d 02 | 0e 18 84 98 02 0e 1a 84 |.}....}.|........|
|000030d0| be 02 0e 19 84 be 02 0e | 43 83 91 02 0e 18 84 be |........|C.......|
|000030e0| 02 0e 17 cb 3d 83 be 02 | e3 e4 e5 d2 5c 22 21 4a |....=...|....\"!J|
|000030f0| 08 48 e6 f4 49 88 e8 08 | 54 43 1e 2f 1e 30 0e 31 |.H..I...|TC./.0.1|
|00003100| 83 ba 02 f2 e7 0e 30 0e | 2f 23 88 2a 82 18 03 0e |......0.|/#.*....|
|00003110| 17 cb 3d 83 0b 03 e3 e4 | e5 d2 5c 22 21 4a 08 48 |..=.....|..\"!J.H|
|00003120| e6 f4 49 88 81 47 00 08 | 54 0e 1a 83 e2 02 81 48 |..I..G..|T......H|
|00003130| 00 82 f5 02 0e 19 83 ed | 02 81 49 00 82 f5 02 0e |........|..I.....|
|00003140| 18 85 f5 02 81 4a 00 44 | 1e 2f 1e 30 0e 31 83 07 |.....J.D|./.0.1..|
|00003150| 03 f2 e7 0e 30 0e 2f 23 | 88 2a 82 18 03 e3 e4 e5 |....0./#|.*......|
|00003160| d2 5c 22 21 4a 08 48 e6 | d6 49 88 81 4b 00 08 21 |.\"!J.H.|.I..K..!|
|00003170| 2e 0b 87 22 20 5b 6e 20 | 65 64 69 66 66 2d 63 75 |..." [n |ediff-cu|
|00003180| 72 72 65 6e 74 2d 64 69 | 66 66 65 72 65 6e 63 65 |rrent-di|fference|
|00003190| 20 65 64 69 66 66 2d 6e | 75 6d 62 65 72 2d 6f 66 | ediff-n|umber-of|
|000031a0| 2d 64 69 66 66 65 72 65 | 6e 63 65 73 20 31 20 65 |-differe|nces 1 e|
|000031b0| 72 72 6f 72 20 65 64 69 | 66 66 2d 4e 4f 2d 44 49 |rror edi|ff-NO-DI|
|000031c0| 46 46 45 52 45 4e 43 45 | 53 20 65 64 69 66 66 2d |FFERENCE|S ediff-|
|000031d0| 77 6f 72 64 2d 6d 6f 64 | 65 20 73 6b 69 70 20 66 |word-mod|e skip f|
|000031e0| 6c 61 67 20 6e 69 78 20 | 65 64 69 66 66 2d 61 75 |lag nix |ediff-au|
|000031f0| 74 6f 2d 72 65 66 69 6e | 65 20 30 20 67 65 74 2d |to-refin|e 0 get-|
|00003200| 62 75 66 66 65 72 2d 63 | 72 65 61 74 65 20 65 64 |buffer-c|reate ed|
|00003210| 69 66 66 2d 74 6d 70 2d | 62 75 66 66 65 72 20 65 |iff-tmp-|buffer e|
|00003220| 64 69 66 66 2d 74 65 6d | 70 2d 66 69 6c 65 2d 41 |diff-tem|p-file-A|
|00003230| 20 65 64 69 66 66 2d 74 | 65 6d 70 2d 66 69 6c 65 | ediff-t|emp-file|
|00003240| 2d 42 20 65 64 69 66 66 | 2d 74 65 6d 70 2d 66 69 |-B ediff|-temp-fi|
|00003250| 6c 65 2d 43 20 65 64 69 | 66 66 2d 65 6d 70 74 79 |le-C edi|ff-empty|
|00003260| 2d 64 69 66 66 2d 72 65 | 67 69 6f 6e 2d 70 20 41 |-diff-re|gion-p A|
|00003270| 20 42 20 43 20 65 64 69 | 66 66 2d 77 68 69 74 65 | B C edi|ff-white|
|00003280| 73 70 61 63 65 2d 64 69 | 66 66 2d 72 65 67 69 6f |space-di|ff-regio|
|00003290| 6e 2d 70 20 6e 69 6c 20 | 63 75 6d 75 6c 61 74 69 |n-p nil |cumulati|
|000032a0| 76 65 2d 66 69 6e 65 2d | 64 69 66 66 2d 6c 65 6e |ve-fine-|diff-len|
|000032b0| 67 74 68 20 77 68 69 74 | 65 73 70 61 63 65 2d 43 |gth whit|espace-C|
|000032c0| 20 77 68 69 74 65 73 70 | 61 63 65 2d 42 20 77 68 | whitesp|ace-B wh|
|000032d0| 69 74 65 73 70 61 63 65 | 2d 41 20 65 6d 70 74 79 |itespace|-A empty|
|000032e0| 2d 43 20 65 6d 70 74 79 | 2d 42 20 65 6d 70 74 79 |-C empty|-B empty|
|000032f0| 2d 41 20 66 69 6c 65 2d | 43 20 66 69 6c 65 2d 42 |-A file-|C file-B|
|00003300| 20 66 69 6c 65 2d 41 20 | 74 6d 70 2d 62 75 66 66 | file-A |tmp-buff|
|00003310| 65 72 20 6e 6f 66 6f 72 | 63 65 20 69 6e 74 65 72 |er nofor|ce inter|
|00003320| 6e 20 66 6f 72 6d 61 74 | 20 22 65 64 69 66 66 2d |n format| "ediff-|
|00003330| 64 69 66 66 65 72 65 6e | 63 65 2d 76 65 63 74 6f |differen|ce-vecto|
|00003340| 72 2d 25 53 22 20 32 20 | 6d 65 73 73 61 67 65 20 |r-%S" 2 |message |
|00003350| 22 4f 6e 6c 79 20 77 68 | 69 74 65 2d 73 70 61 63 |"Only wh|ite-spac|
|00003360| 65 20 64 69 66 66 65 72 | 65 6e 63 65 73 20 69 6e |e differ|ences in|
|00003370| 20 72 65 67 69 6f 6e 20 | 25 64 22 20 64 65 6c 71 | region |%d" delq|
|00003380| 20 65 64 69 66 66 2d 6c | 6f 6f 6b 73 2d 6c 69 6b | ediff-l|ooks-lik|
|00003390| 65 2d 63 6f 6d 62 69 6e | 65 64 2d 6d 65 72 67 65 |e-combin|ed-merge|
|000033a0| 20 65 64 69 66 66 2d 6d | 65 72 67 65 2d 6a 6f 62 | ediff-m|erge-job|
|000033b0| 20 65 64 69 66 66 2d 73 | 65 74 2d 66 69 6e 65 2d | ediff-s|et-fine-|
|000033c0| 6f 76 65 72 6c 61 79 73 | 2d 69 6e 2d 6f 6e 65 2d |overlays|-in-one-|
|000033d0| 62 75 66 66 65 72 20 65 | 64 69 66 66 2d 33 77 61 |buffer e|diff-3wa|
|000033e0| 79 2d 63 6f 6d 70 61 72 | 69 73 6f 6e 2d 6a 6f 62 |y-compar|ison-job|
|000033f0| 20 22 52 65 67 69 6f 6e | 20 25 64 20 69 73 20 65 | "Region| %d is e|
|00003400| 6d 70 74 79 20 69 6e 20 | 61 6c 6c 20 62 75 66 66 |mpty in |all buff|
|00003410| 65 72 73 20 62 75 74 20 | 25 53 22 20 61 72 67 73 |ers but |%S" args|
|00003420| 20 73 74 72 69 6e 67 20 | 65 64 69 66 66 2d 76 65 | string |ediff-ve|
|00003430| 72 62 6f 73 65 2d 70 20 | 61 70 70 6c 79 20 22 52 |rbose-p |apply "R|
|00003440| 65 67 69 6f 6e 20 25 64 | 20 69 6e 20 62 75 66 66 |egion %d| in buff|
|00003450| 65 72 20 25 53 20 69 73 | 20 65 6d 70 74 79 22 20 |er %S is| empty" |
|00003460| 74 20 28 6f 66 66 20 6e | 69 78 29 20 22 52 65 67 |t (off n|ix) "Reg|
|00003470| 69 6f 6e 20 25 64 20 65 | 78 63 65 65 64 73 20 61 |ion %d e|xceeds a|
|00003480| 75 74 6f 2d 72 65 66 69 | 6e 65 20 6c 69 6d 69 74 |uto-refi|ne limit|
|00003490| 2e 20 54 79 70 65 20 60 | 25 73 27 20 74 6f 20 72 |. Type `|%s' to r|
|000034a0| 65 66 69 6e 65 22 20 73 | 75 62 73 74 69 74 75 74 |efine" s|ubstitut|
|000034b0| 65 2d 63 6f 6d 6d 61 6e | 64 2d 6b 65 79 73 20 22 |e-comman|d-keys "|
|000034c0| 5c 5c 5b 65 64 69 66 66 | 2d 6d 61 6b 65 2d 6f 72 |\\[ediff|-make-or|
|000034d0| 2d 6b 69 6c 6c 2d 66 69 | 6e 65 2d 64 69 66 66 73 |-kill-fi|ne-diffs|
|000034e0| 5d 22 20 65 64 69 66 66 | 2d 77 6f 72 64 69 66 79 |]" ediff|-wordify|
|000034f0| 20 65 64 69 66 66 2d 67 | 65 74 2d 64 69 66 66 2d | ediff-g|et-diff-|
|00003500| 70 6f 73 6e 20 62 65 67 | 20 65 6e 64 20 65 64 69 |posn beg| end edi|
|00003510| 66 66 2d 62 75 66 66 65 | 72 2d 41 20 65 64 69 66 |ff-buffe|r-A edif|
|00003520| 66 2d 63 6f 6e 74 72 6f | 6c 2d 62 75 66 66 65 72 |f-contro|l-buffer|
|00003530| 20 65 64 69 66 66 2d 6d | 61 6b 65 2d 74 65 6d 70 | ediff-m|ake-temp|
|00003540| 2d 66 69 6c 65 20 22 66 | 69 6e 65 44 69 66 66 41 |-file "f|ineDiffA|
|00003550| 22 20 65 64 69 66 66 2d | 62 75 66 66 65 72 2d 42 |" ediff-|buffer-B|
|00003560| 20 22 66 69 6e 65 44 69 | 66 66 42 22 20 65 64 69 | "fineDi|ffB" edi|
|00003570| 66 66 2d 33 77 61 79 2d | 6a 6f 62 20 65 64 69 66 |ff-3way-|job edif|
|00003580| 66 2d 62 75 66 66 65 72 | 2d 43 20 22 66 69 6e 65 |f-buffer|-C "fine|
|00003590| 44 69 66 66 43 22 20 65 | 64 69 66 66 2d 73 65 74 |DiffC" e|diff-set|
|000035a0| 75 70 2d 66 69 6e 65 2d | 64 69 66 66 2d 72 65 67 |up-fine-|diff-reg|
|000035b0| 69 6f 6e 73 20 22 4f 6e | 6c 79 20 77 68 69 74 65 |ions "On|ly white|
|000035c0| 2d 73 70 61 63 65 20 64 | 69 66 66 65 72 65 6e 63 |-space d|ifferenc|
|000035d0| 65 73 20 69 6e 20 72 65 | 67 69 6f 6e 20 25 64 20 |es in re|gion %d |
|000035e0| 25 73 22 20 22 69 6e 20 | 62 75 66 66 65 72 73 20 |%s" "in |buffers |
|000035f0| 42 20 26 20 43 22 20 22 | 69 6e 20 62 75 66 66 65 |B & C" "|in buffe|
|00003600| 72 73 20 41 20 26 20 43 | 22 20 22 69 6e 20 62 75 |rs A & C|" "in bu|
|00003610| 66 66 65 72 73 20 41 20 | 26 20 42 22 20 65 64 69 |ffers A |& B" edi|
|00003620| 66 66 2d 73 65 74 2d 66 | 69 6e 65 2d 64 69 66 66 |ff-set-f|ine-diff|
|00003630| 2d 70 72 6f 70 65 72 74 | 69 65 73 5d 20 31 32 5d |-propert|ies] 12]|
|00003640| 29 0a 28 64 65 66 61 6c | 69 61 73 20 27 65 64 69 |).(defal|ias 'edi|
|00003650| 66 66 2d 69 6e 73 74 61 | 6c 6c 2d 66 69 6e 65 2d |ff-insta|ll-fine-|
|00003660| 64 69 66 66 2d 69 66 2d | 6e 65 63 65 73 73 61 72 |diff-if-|necessar|
|00003670| 79 20 23 5b 28 6e 29 20 | 22 08 c1 3d 83 36 00 5c |y #[(n) |"..=.6.\|
|00003680| 6e c3 c4 c5 0e 06 23 c3 | c4 c7 0e 06 23 5a 56 83 |n.....#.|....#ZV.|
|00003690| 30 00 5c 6e c3 c8 c5 0e | 06 23 c3 c8 c7 0e 06 23 |0.\n....|.#.....#|
|000036a0| 5a 56 83 30 00 c9 0e 06 | ca 5c 22 87 c9 0e 06 cb |ZV.0....|.\".....|
|000036b0| 5c 22 87 08 cc 3d 85 41 | 00 c9 0e 06 cb 5c 22 87 |\"...=.A|.....\".|
|000036c0| 22 20 5b 65 64 69 66 66 | 2d 61 75 74 6f 2d 72 65 |" [ediff|-auto-re|
|000036d0| 66 69 6e 65 20 6f 6e 20 | 65 64 69 66 66 2d 61 75 |fine on |ediff-au|
|000036e0| 74 6f 2d 72 65 66 69 6e | 65 2d 6c 69 6d 69 74 20 |to-refin|e-limit |
|000036f0| 65 64 69 66 66 2d 67 65 | 74 2d 64 69 66 66 2d 70 |ediff-ge|t-diff-p|
|00003700| 6f 73 6e 20 41 20 65 6e | 64 20 6e 20 62 65 67 20 |osn A en|d n beg |
|00003710| 42 20 65 64 69 66 66 2d | 6d 61 6b 65 2d 66 69 6e |B ediff-|make-fin|
|00003720| 65 2d 64 69 66 66 73 20 | 6e 6f 66 6f 72 63 65 20 |e-diffs |noforce |
|00003730| 73 6b 69 70 20 6f 66 66 | 5d 20 36 5d 29 0a 28 64 |skip off|] 6]).(d|
|00003740| 65 66 61 6c 69 61 73 20 | 27 65 64 69 66 66 2d 73 |efalias |'ediff-s|
|00003750| 65 74 2d 66 69 6e 65 2d | 64 69 66 66 2d 70 72 6f |et-fine-|diff-pro|
|00003760| 70 65 72 74 69 65 73 20 | 23 5b 28 6e 20 26 6f 70 |perties |#[(n &op|
|00003770| 74 69 6f 6e 61 6c 20 64 | 65 66 61 75 6c 74 29 20 |tional d|efault) |
|00003780| 22 c0 20 3f 86 2b 00 09 | c2 57 86 2b 00 09 0b 59 |". ?.+..|.W.+...Y|
|00003790| 86 2b 00 c4 c5 09 0e 06 | 23 88 c4 c7 09 0e 06 23 |.+......|#......#|
|000037a0| 88 0e 08 85 2b 00 c4 c9 | 09 0e 06 23 87 22 20 5b |....+...|...#." [|
|000037b0| 65 64 69 66 66 2d 68 61 | 73 2d 66 61 63 65 2d 73 |ediff-ha|s-face-s|
|000037c0| 75 70 70 6f 72 74 2d 70 | 20 6e 20 30 20 65 64 69 |upport-p| n 0 edi|
|000037d0| 66 66 2d 6e 75 6d 62 65 | 72 2d 6f 66 2d 64 69 66 |ff-numbe|r-of-dif|
|000037e0| 66 65 72 65 6e 63 65 73 | 20 65 64 69 66 66 2d 73 |ferences| ediff-s|
|000037f0| 65 74 2d 66 69 6e 65 2d | 64 69 66 66 2d 70 72 6f |et-fine-|diff-pro|
|00003800| 70 65 72 74 69 65 73 2d | 69 6e 2d 6f 6e 65 2d 62 |perties-|in-one-b|
|00003810| 75 66 66 65 72 20 41 20 | 64 65 66 61 75 6c 74 20 |uffer A |default |
|00003820| 42 20 65 64 69 66 66 2d | 33 77 61 79 2d 6a 6f 62 |B ediff-|3way-job|
|00003830| 20 43 5d 20 34 5d 29 0a | 28 64 65 66 61 6c 69 61 | C] 4]).|(defalia|
|00003840| 73 20 27 65 64 69 66 66 | 2d 73 65 74 2d 66 69 6e |s 'ediff|-set-fin|
|00003850| 65 2d 64 69 66 66 2d 70 | 72 6f 70 65 72 74 69 65 |e-diff-p|ropertie|
|00003860| 73 2d 69 6e 2d 6f 6e 65 | 2d 62 75 66 66 65 72 20 |s-in-one|-buffer |
|00003870| 23 5b 28 62 75 66 2d 74 | 79 70 65 20 6e 20 26 6f |#[(buf-t|ype n &o|
|00003880| 70 74 69 6f 6e 61 6c 20 | 64 65 66 61 75 6c 74 29 |ptional |default)|
|00003890| 20 22 c0 c1 c2 0b 5c 22 | 21 4a 5c 66 48 c5 48 0e | "....\"|!J\fH.H.|
|000038a0| 06 83 14 00 c6 82 1c 00 | c7 c0 c1 c8 0b 5c 22 21 |........|.....\"!|
|000038b0| 21 0e 06 83 25 00 c9 82 | 34 00 ca c0 c1 cb 0b 5c |!...%...|4......\|
|000038c0| 22 21 4a cc 5c 22 86 33 | 00 c9 54 1e 5c 66 1e 0d |"!J.\".3|..T.\f..|
|000038d0| 1e 0e cf d0 0e 0e 5c 22 | 2b 87 22 20 5b 69 6e 74 |......\"|+." [int|
|000038e0| 65 72 6e 20 66 6f 72 6d | 61 74 20 22 65 64 69 66 |ern form|at "edif|
|000038f0| 66 2d 64 69 66 66 65 72 | 65 6e 63 65 2d 76 65 63 |f-differ|ence-vec|
|00003900| 74 6f 72 2d 25 53 22 20 | 62 75 66 2d 74 79 70 65 |tor-%S" |buf-type|
|00003910| 20 6e 20 31 20 64 65 66 | 61 75 6c 74 20 66 61 63 | n 1 def|ault fac|
|00003920| 65 2d 6e 61 6d 65 20 22 | 65 64 69 66 66 2d 66 69 |e-name "|ediff-fi|
|00003930| 6e 65 2d 64 69 66 66 2d | 66 61 63 65 2d 25 53 22 |ne-diff-|face-%S"|
|00003940| 20 30 20 65 64 69 66 66 | 2d 6f 76 65 72 6c 61 79 | 0 ediff|-overlay|
|00003950| 2d 67 65 74 20 22 65 64 | 69 66 66 2d 63 75 72 72 |-get "ed|iff-curr|
|00003960| 65 6e 74 2d 64 69 66 66 | 2d 6f 76 65 72 6c 61 79 |ent-diff|-overlay|
|00003970| 2d 25 53 22 20 70 72 69 | 6f 72 69 74 79 20 66 61 |-%S" pri|ority fa|
|00003980| 63 65 20 66 69 6e 65 2d | 64 69 66 66 2d 76 65 63 |ce fine-|diff-vec|
|00003990| 74 6f 72 20 6d 61 70 63 | 61 72 20 23 5b 28 6f 76 |tor mapc|ar #[(ov|
|000039a0| 65 72 6c 29 20 22 c0 09 | 5c 6e 5c 22 88 c3 09 c4 |erl) "..|\n\"....|
|000039b0| 5c 66 23 87 22 20 5b 65 | 64 69 66 66 2d 73 65 74 |\f#." [e|diff-set|
|000039c0| 2d 6f 76 65 72 6c 61 79 | 2d 66 61 63 65 20 6f 76 |-overlay|-face ov|
|000039d0| 65 72 6c 20 66 61 63 65 | 20 65 64 69 66 66 2d 6f |erl face| ediff-o|
|000039e0| 76 65 72 6c 61 79 2d 70 | 75 74 20 70 72 69 6f 72 |verlay-p|ut prior|
|000039f0| 69 74 79 5d 20 34 5d 5d | 20 37 5d 29 0a 28 64 65 |ity] 4]]| 7]).(de|
|00003a00| 66 61 6c 69 61 73 20 27 | 65 64 69 66 66 2d 73 65 |falias '|ediff-se|
|00003a10| 74 2d 66 69 6e 65 2d 6f | 76 65 72 6c 61 79 73 2d |t-fine-o|verlays-|
|00003a20| 66 6f 72 2d 63 6f 6d 62 | 69 6e 65 64 2d 6d 65 72 |for-comb|ined-mer|
|00003a30| 67 65 20 23 5b 28 64 69 | 66 66 2d 6c 69 73 74 20 |ge #[(di|ff-list |
|00003a40| 72 65 67 2d 6e 75 6d 29 | 20 22 c0 89 89 19 1a 1b |reg-num)| "......|
|00003a50| c4 0d 40 0d 41 40 0e 06 | 23 13 c4 c7 0d 38 c8 0d |..@.A@..|#....8..|
|00003a60| 38 0e 06 23 12 c4 c9 0d | 38 ca 0d 38 0e 06 23 11 |8..#....|8..8..#.|
|00003a70| cb cc cd ce 5c 22 21 4a | 0e 0f 48 d0 d1 0b 5c 6e |....\"!J|..H...\n|
|00003a80| 09 23 49 2b 87 22 20 5b | 6e 69 6c 20 6f 76 65 72 |.#I+." [|nil over|
|00003a90| 6c 61 79 33 20 6f 76 65 | 72 6c 61 79 32 20 6f 76 |lay3 ove|rlay2 ov|
|00003aa0| 65 72 6c 61 79 31 20 65 | 64 69 66 66 2d 6d 61 6b |erlay1 e|diff-mak|
|00003ab0| 65 2d 62 75 6c 6c 65 74 | 2d 70 72 6f 6f 66 2d 6f |e-bullet|-proof-o|
|00003ac0| 76 65 72 6c 61 79 20 64 | 69 66 66 2d 6c 69 73 74 |verlay d|iff-list|
|00003ad0| 20 65 64 69 66 66 2d 62 | 75 66 66 65 72 2d 43 20 | ediff-b|uffer-C |
|00003ae0| 32 20 33 20 34 20 35 20 | 69 6e 74 65 72 6e 20 66 |2 3 4 5 |intern f|
|00003af0| 6f 72 6d 61 74 20 22 65 | 64 69 66 66 2d 64 69 66 |ormat "e|diff-dif|
|00003b00| 66 65 72 65 6e 63 65 2d | 76 65 63 74 6f 72 2d 25 |ference-|vector-%|
|00003b10| 53 22 20 43 20 72 65 67 | 2d 6e 75 6d 20 31 20 76 |S" C reg|-num 1 v|
|00003b20| 65 63 74 6f 72 5d 20 36 | 5d 29 0a 28 64 65 66 61 |ector] 6|]).(defa|
|00003b30| 6c 69 61 73 20 27 65 64 | 69 66 66 2d 73 65 74 2d |lias 'ed|iff-set-|
|00003b40| 66 69 6e 65 2d 6f 76 65 | 72 6c 61 79 73 2d 69 6e |fine-ove|rlays-in|
|00003b50| 2d 6f 6e 65 2d 62 75 66 | 66 65 72 20 23 5b 28 62 |-one-buf|fer #[(b|
|00003b60| 75 66 2d 74 79 70 65 20 | 64 69 66 66 2d 6c 69 73 |uf-type |diff-lis|
|00003b70| 74 20 72 65 67 69 6f 6e | 2d 6e 75 6d 29 20 22 c0 |t region|-num) ".|
|00003b80| 19 c2 0b c4 0d 23 1e 06 | 0b c7 3d 83 14 00 0e 08 |.....#..|..=.....|
|00003b90| 82 32 00 0b c9 3d 83 1f | 00 0e 5c 6e 82 32 00 0b |.2...=..|..\n.2..|
|00003ba0| cb 3d 83 2a 00 0e 5c 66 | 82 32 00 0b cd 3d 85 32 |.=.*..\f|.2...=.2|
|00003bb0| 00 0e 0e 1e 0f d0 1e 11 | d0 1e 12 d0 1e 13 d0 1e |........|........|
|00003bc0| 14 d0 1e 15 d0 1e 16 0d | 0b 1b 1e 17 d8 d9 da 0b |........|........|
|00003bd0| 5c 22 21 4a 0e 17 48 89 | 1e 1b 83 63 00 dc dd 0e |\"!J..H.|...c....|
|00003be0| 1b de 48 5c 22 88 29 d8 | d9 da 0b 5c 22 21 4a 0e |..H\".).|...\"!J.|
|00003bf0| 17 48 de d0 49 88 2a 0e | 1f 41 16 1f 70 1e 20 0e |.H..I.*.|.A..p. .|
|00003c00| 0f 83 9e 00 e1 0e 0f 21 | 83 9e 00 e2 e1 0e 0f 21 |.......!|.......!|
|00003c10| 21 83 9e 00 e3 8e 0e 0f | 71 88 0e 06 62 88 29 82 |!.......|q...b.).|
|00003c20| aa 00 0e 24 e5 3d 84 aa | 00 e6 0e 27 21 88 29 0e |...$.=..|...'!.).|
|00003c30| 28 83 c7 00 0b cb 3d 83 | c7 00 e9 0d 21 89 16 11 |(.....=.|....!...|
|00003c40| 83 c7 00 ea 0e 11 0d 5c | 22 82 4d 01 0e 1f 83 3e |.......\|".M....>|
|00003c50| 01 09 54 11 0e 1f 40 89 | 16 13 0b c7 3d 83 df 00 |..T...@.|....=...|
|00003c60| eb 82 ea 00 0b c9 3d 83 | e9 00 ec 82 ea 00 ed 48 |......=.|.......H|
|00003c70| 16 14 0e 13 0b c7 3d 83 | f9 00 de 82 04 01 0b c9 |......=.|........|
|00003c80| 3d 83 03 01 ee 82 04 01 | ef 48 16 15 0e 14 84 11 |=.......|.H......|
|00003c90| 01 0e 15 83 35 01 f0 0e | 14 54 0e 0f 5c 22 16 14 |....5...|.T..\"..|
|00003ca0| f0 0e 15 0e 0f d5 23 16 | 15 f1 0e 14 0e 15 0e 0f |......#.|........|
|00003cb0| 23 16 16 0e 12 0e 16 43 | a4 16 12 0e 1f 41 89 16 |#......C|.....A..|
|00003cc0| 1f 84 cc 00 d8 d9 da 0b | 5c 22 21 4a 0d 48 de f2 |........|\"!J.H..|
|00003cd0| 0e 12 21 49 2e 09 87 22 | 20 5b 2d 31 20 63 75 72 |..!I..."| [-1 cur|
|00003ce0| 72 65 6e 74 2d 64 69 66 | 66 20 65 64 69 66 66 2d |rent-dif|f ediff-|
|00003cf0| 67 65 74 2d 64 69 66 66 | 2d 70 6f 73 6e 20 62 75 |get-diff|-posn bu|
|00003d00| 66 2d 74 79 70 65 20 62 | 65 67 20 72 65 67 69 6f |f-type b|eg regio|
|00003d10| 6e 2d 6e 75 6d 20 72 65 | 67 2d 73 74 61 72 74 20 |n-num re|g-start |
|00003d20| 41 20 65 64 69 66 66 2d | 62 75 66 66 65 72 2d 41 |A ediff-|buffer-A|
|00003d30| 20 42 20 65 64 69 66 66 | 2d 62 75 66 66 65 72 2d | B ediff|-buffer-|
|00003d40| 42 20 43 20 65 64 69 66 | 66 2d 62 75 66 66 65 72 |B C edif|f-buffer|
|00003d50| 2d 43 20 41 6e 63 65 73 | 74 6f 72 20 65 64 69 66 |-C Ances|tor edif|
|00003d60| 66 2d 61 6e 63 65 73 74 | 6f 72 2d 62 75 66 66 65 |f-ancest|or-buffe|
|00003d70| 72 20 62 75 66 66 20 6e | 69 6c 20 63 6f 6d 62 69 |r buff n|il combi|
|00003d80| 6e 65 64 2d 6d 65 72 67 | 65 2d 64 69 66 66 2d 6c |ned-merg|e-diff-l|
|00003d90| 69 73 74 20 64 69 66 66 | 2d 6f 76 65 72 6c 61 79 |ist diff|-overlay|
|00003da0| 2d 6c 69 73 74 20 6c 69 | 73 74 2d 65 6c 65 6d 65 |-list li|st-eleme|
|00003db0| 6e 74 20 62 65 67 69 6e | 20 65 6e 64 20 6f 76 65 |nt begin| end ove|
|00003dc0| 72 6c 61 79 20 6e 20 69 | 6e 74 65 72 6e 20 66 6f |rlay n i|ntern fo|
|00003dd0| 72 6d 61 74 20 22 65 64 | 69 66 66 2d 64 69 66 66 |rmat "ed|iff-diff|
|00003de0| 65 72 65 6e 63 65 2d 76 | 65 63 74 6f 72 2d 25 53 |erence-v|ector-%S|
|00003df0| 22 20 64 69 66 66 2d 72 | 65 63 6f 72 64 20 6d 61 |" diff-r|ecord ma|
|00003e00| 70 63 61 72 20 65 64 69 | 66 66 2d 64 65 6c 65 74 |pcar edi|ff-delet|
|00003e10| 65 2d 6f 76 65 72 6c 61 | 79 20 31 20 64 69 66 66 |e-overla|y 1 diff|
|00003e20| 2d 6c 69 73 74 20 53 74 | 61 72 74 42 75 66 66 65 |-list St|artBuffe|
|00003e30| 72 20 67 65 74 2d 62 75 | 66 66 65 72 20 62 75 66 |r get-bu|ffer buf|
|00003e40| 66 65 72 2d 6e 61 6d 65 | 20 28 28 73 65 74 2d 62 |fer-name| ((set-b|
|00003e50| 75 66 66 65 72 20 53 74 | 61 72 74 42 75 66 66 65 |uffer St|artBuffe|
|00003e60| 72 29 29 20 74 68 69 73 | 2d 63 6f 6d 6d 61 6e 64 |r)) this|-command|
|00003e70| 20 65 64 69 66 66 2d 71 | 75 69 74 20 65 72 72 6f | ediff-q|uit erro|
|00003e80| 72 20 65 64 69 66 66 2d | 4b 49 4c 4c 45 44 2d 56 |r ediff-|KILLED-V|
|00003e90| 49 54 41 4c 2d 42 55 46 | 46 45 52 20 65 64 69 66 |ITAL-BUF|FER edif|
|00003ea0| 66 2d 6d 65 72 67 65 2d | 6a 6f 62 20 65 64 69 66 |f-merge-|job edif|
|00003eb0| 66 2d 6c 6f 6f 6b 73 2d | 6c 69 6b 65 2d 63 6f 6d |f-looks-|like-com|
|00003ec0| 62 69 6e 65 64 2d 6d 65 | 72 67 65 20 65 64 69 66 |bined-me|rge edif|
|00003ed0| 66 2d 73 65 74 2d 66 69 | 6e 65 2d 6f 76 65 72 6c |f-set-fi|ne-overl|
|00003ee0| 61 79 73 2d 66 6f 72 2d | 63 6f 6d 62 69 6e 65 64 |ays-for-|combined|
|00003ef0| 2d 6d 65 72 67 65 20 30 | 20 32 20 34 20 33 20 35 |-merge 0| 2 4 3 5|
|00003f00| 20 65 64 69 66 66 2d 67 | 6f 74 6f 2d 77 6f 72 64 | ediff-g|oto-word|
|00003f10| 20 65 64 69 66 66 2d 6d | 61 6b 65 2d 62 75 6c 6c | ediff-m|ake-bull|
|00003f20| 65 74 2d 70 72 6f 6f 66 | 2d 6f 76 65 72 6c 61 79 |et-proof|-overlay|
|00003f30| 20 76 63 6f 6e 63 61 74 | 5d 20 36 5d 29 0a 28 64 | vconcat|] 6]).(d|
|00003f40| 65 66 61 6c 69 61 73 20 | 27 65 64 69 66 66 2d 67 |efalias |'ediff-g|
|00003f50| 65 74 2d 64 69 66 66 33 | 2d 67 72 6f 75 70 20 23 |et-diff3|-group #|
|00003f60| 5b 28 66 69 6c 65 29 20 | 22 8a c0 c1 5c 6e c3 51 |[(file) |"...\n.Q|
|00003f70| 21 88 c4 79 88 c5 94 c5 | 95 7b c6 98 83 3e 00 c7 |!..y....|.{...>..|
|00003f80| 94 83 2d 00 c8 c4 94 c4 | 95 7b 21 c8 c9 94 c9 95 |..-.....|.{!.....|
|00003f90| 7b 21 54 44 82 48 00 c8 | c4 94 c4 95 7b 21 89 1e |{!TD.H..|....{!..|
|00003fa0| 5c 6e 89 54 29 44 82 48 | 00 c8 c4 94 c4 95 7b 21 |\n.T)D.H|......{!|
|00003fb0| 54 89 44 29 87 22 20 5b | 72 65 2d 73 65 61 72 63 |T.D)." [|re-searc|
|00003fc0| 68 2d 66 6f 72 77 61 72 | 64 20 22 5e 22 20 66 69 |h-forwar|d "^" fi|
|00003fd0| 6c 65 20 22 3a 5c 5c 28 | 5b 30 2d 39 5d 2b 5c 5c |le ":\\(|[0-9]+\\|
|00003fe0| 29 5c 5c 28 2c 5c 5c 28 | 5b 30 2d 39 5d 2b 5c 5c |)\\(,\\(|[0-9]+\\|
|00003ff0| 29 5c 5c 29 3f 5c 5c 28 | 5b 61 63 5d 5c 5c 29 24 |)\\)?\\(|[ac]\\)$|
|00004000| 22 20 31 20 34 20 22 63 | 22 20 32 20 73 74 72 69 |" 1 4 "c|" 2 stri|
|00004010| 6e 67 2d 74 6f 2d 69 6e | 74 20 33 20 78 5d 20 35 |ng-to-in|t 3 x] 5|
|00004020| 5d 29 0a 28 64 65 66 61 | 6c 69 61 73 20 27 65 64 |]).(defa|lias 'ed|
|00004030| 69 66 66 2d 65 78 74 72 | 61 63 74 2d 64 69 66 66 |iff-extr|act-diff|
|00004040| 73 33 20 23 5b 28 64 69 | 66 66 2d 62 75 66 66 65 |s3 #[(di|ff-buffe|
|00004050| 72 20 77 6f 72 64 2d 6d | 6f 64 65 20 74 68 72 65 |r word-m|ode thre|
|00004060| 65 2d 77 61 79 2d 63 6f | 6d 70 20 26 6f 70 74 69 |e-way-co|mp &opti|
|00004070| 6f 6e 61 6c 20 62 6f 75 | 6e 64 73 29 20 22 08 09 |onal bou|nds) "..|
|00004080| 5c 6e 0b c4 89 89 89 c5 | 89 89 89 1e 06 1e 07 1e |\n......|........|
|00004090| 08 1e 09 1e 5c 6e 1e 0b | 1e 5c 66 1e 0d 1e 0e 1e |....\n..|.\f.....|
|000040a0| 0f 1e 10 1e 11 0e 12 83 | 2d 00 d3 82 2e 00 d4 0e |........|-.......|
|000040b0| 09 42 16 09 0e 15 83 54 | 00 d6 0e 15 40 21 16 08 |.B.....T|....@!..|
|000040c0| d6 0e 15 41 40 21 16 07 | 0e 17 85 52 00 d6 d8 0e |...A@!..|...R....|
|000040d0| 15 38 21 16 06 70 1e 19 | 0e 11 83 83 00 da 0e 11 |.8!..p..|........|
|000040e0| 21 83 83 00 db da 0e 11 | 21 21 83 83 00 dc 8e 0e |!.......|!!......|
|000040f0| 11 71 88 0e 08 83 7c 00 | 0e 08 82 7d 00 65 62 88 |.q....|.|...}.eb.|
|00004100| 29 82 8f 00 0e 1d de 3d | 84 8f 00 df 0e 20 21 88 |)......=|..... !.|
|00004110| 29 70 1e 19 0e 10 83 bf | 00 da 0e 10 21 83 bf 00 |)p......|....!...|
|00004120| db da 0e 10 21 21 83 bf | 00 e1 8e 0e 10 71 88 0e |....!!..|.....q..|
|00004130| 07 83 b8 00 0e 07 82 b9 | 00 65 62 88 29 82 cb 00 |........|.eb.)...|
|00004140| 0e 1d de 3d 84 cb 00 df | 0e 20 21 88 29 0e 17 83 |...=....|. !.)...|
|00004150| 0d 01 70 1e 19 0e 0f 83 | 00 01 da 0e 0f 21 83 00 |..p.....|.....!..|
|00004160| 01 db da 0e 0f 21 21 83 | 00 01 e2 8e 0e 0f 71 88 |.....!!.|......q.|
|00004170| 0e 06 83 f9 00 0e 06 82 | fa 00 65 62 88 29 82 5c |........|..eb.).\|
|00004180| 66 01 0e 1d de 3d 84 5c | 66 01 df 0e 20 21 88 29 |f....=.\|f... !.)|
|00004190| 0e 0e 83 54 01 da 0e 0e | 21 83 54 01 db da 0e 0e |...T....|!.T.....|
|000041a0| 21 21 83 54 01 70 1e 19 | 0e 0e 83 47 01 da 0e 0e |!!.T.p..|...G....|
|000041b0| 21 83 47 01 db da 0e 0e | 21 21 83 47 01 e3 8e 0e |!.G.....|!!.G....|
|000041c0| 0e 71 88 65 62 88 29 82 | 53 01 0e 1d de 3d 84 53 |.q.eb.).|S....=.S|
|000041d0| 01 df 0e 20 21 88 29 70 | 1e 19 0e 24 83 1c 04 da |... !.)p|...$....|
|000041e0| 0e 24 21 83 1c 04 db da | 0e 24 21 21 83 1c 04 e5 |.$!.....|.$!!....|
|000041f0| 8e 0e 24 71 88 65 62 88 | e6 0e 27 c5 e8 23 83 18 |..$q.eb.|..'..#..|
|00004200| 04 c4 79 88 c4 94 c4 95 | 7b 1e 29 0e 17 84 94 01 |..y.....|{.).....|
|00004210| 0e 29 ea 98 84 14 04 eb | ec 21 40 1e 2d eb ec 21 |.)......|.!@.-..!|
|00004220| 41 40 1e 2e eb ef 21 40 | 1e 30 eb ef 21 41 40 1e |A@....!@|.0..!A@.|
|00004230| 31 eb ea 21 40 1e 32 eb | ea 21 41 40 1e 33 0e 29 |1..!@.2.|.!A@.3.)|
|00004240| ec 98 83 c6 01 f4 82 d3 | 01 0e 29 ef 98 83 d1 01 |........|..).....|
|00004250| f5 82 d3 01 0e 36 89 1e | 37 f8 3e 83 df 01 f9 82 |.....6..|7.>.....|
|00004260| e0 01 fa 1e 3b 0e 29 ec | 98 83 ed 01 fa 82 00 02 |....;.).|........|
|00004270| 0e 29 ef 98 83 f8 01 f9 | 82 00 02 0e 29 ea 98 85 |.)......|....)...|
|00004280| 00 02 fc 1e 3d c5 1e 3e | c5 1e 3f c5 1e 40 c5 1e |....=..>|..?..@..|
|00004290| 41 c5 1e 42 c5 1e 43 c5 | 1e 44 c5 1e 45 c5 1e 46 |A..B..C.|.D..E..F|
|000042a0| c5 1e 47 c5 1e 48 0e 32 | 0e 33 55 16 3e 0e 17 83 |..G..H.2|.3U.>...|
|000042b0| 3a 02 0e 32 16 3f 0e 33 | 16 40 82 56 02 0e 36 81 |:..2.?.3|.@.V..6.|
|000042c0| 49 00 3d 83 4e 02 0e 30 | 16 3f 0e 31 16 40 82 56 |I.=.N..0|.?.1.@.V|
|000042d0| 02 0e 2d 16 3f 0e 2e 16 | 40 0e 12 83 98 02 0e 09 |..-.?...|@.......|
|000042e0| 81 4a 00 0e 2d 0e 0d 5a | 0e 2e 0e 2d 5a 0e 30 0e |.J..-..Z|...-Z.0.|
|000042f0| 5c 66 5a 0e 31 0e 30 5a | 0e 3f 0e 0b 5a 0e 40 0e |\fZ.1.0Z|.?..Z.@.|
|00004300| 3f 5a c5 89 89 89 89 26 | 0b 43 a4 16 09 0e 2e 16 |?Z.....&|.C......|
|00004310| 0d 0e 31 16 5c 66 0e 40 | 16 0b 82 12 04 70 1e 19 |..1.\f.@|.....p..|
|00004320| 0e 11 83 d4 02 da 0e 11 | 21 83 d4 02 db da 0e 11 |........|!.......|
|00004330| 21 21 83 d4 02 81 4b 00 | 8e 0e 11 71 88 0e 2d 0e |!!....K.|...q..-.|
|00004340| 0d 5a 79 88 60 16 41 0e | 2e 0e 2d 5a 79 88 60 16 |.Zy.`.A.|..-Zy.`.|
|00004350| 42 0e 2e 16 0d 29 82 e0 | 02 0e 1d de 3d 84 e0 02 |B....)..|....=...|
|00004360| df 0e 20 21 88 29 70 1e | 19 0e 10 83 1d 03 da 0e |.. !.)p.|........|
|00004370| 10 21 83 1d 03 db da 0e | 10 21 21 83 1d 03 81 4c |.!......|.!!....L|
|00004380| 00 8e 0e 10 71 88 0e 30 | 0e 5c 66 5a 79 88 60 16 |....q..0|.\fZy.`.|
|00004390| 43 0e 31 0e 30 5a 79 88 | 60 16 44 0e 31 16 5c 66 |C.1.0Zy.|`.D.1.\f|
|000043a0| 29 82 29 03 0e 1d de 3d | 84 29 03 df 0e 20 21 88 |).)....=|.)... !.|
|000043b0| 29 70 1e 19 0e 0f 83 66 | 03 da 0e 0f 21 83 66 03 |)p.....f|....!.f.|
|000043c0| db da 0e 0f 21 21 83 66 | 03 81 4d 00 8e 0e 0f 71 |....!!.f|..M....q|
|000043d0| 88 0e 3f 0e 0b 5a 79 88 | 60 16 45 0e 40 0e 3f 5a |..?..Zy.|`.E.@.?Z|
|000043e0| 79 88 60 16 46 0e 40 16 | 0b 29 82 72 03 0e 1d de |y.`.F.@.|.).r....|
|000043f0| 3d 84 72 03 df 0e 20 21 | 88 29 0e 0e 83 d1 03 da |=.r... !|.)......|
|00004400| 0e 0e 21 83 d1 03 db da | 0e 0e 21 21 83 d1 03 70 |..!.....|..!!...p|
|00004410| 1e 19 0e 0e 83 c4 03 da | 0e 0e 21 83 c4 03 db da |........|..!.....|
|00004420| 0e 0e 21 21 83 c4 03 81 | 4e 00 8e 0e 0e 71 88 0e |..!!....|N....q..|
|00004430| 32 0e 5c 6e 5a 79 88 60 | 16 47 0e 33 0e 32 5a 79 |2.\nZy.`|.G.3.2Zy|
|00004440| 88 60 16 48 0e 33 16 5c | 6e 29 82 d0 03 0e 1d de |.`.H.3.\|n)......|
|00004450| 3d 84 d0 03 df 0e 20 21 | 88 29 0e 09 0e 17 83 f3 |=..... !|.)......|
|00004460| 03 81 4a 00 0e 41 0e 42 | 0e 43 0e 44 0e 45 0e 46 |..J..A.B|.C.D.E.F|
|00004470| c5 89 0e 3d c5 89 26 0b | 43 82 0f 04 81 4a 00 0e |...=..&.|C....J..|
|00004480| 41 0e 42 0e 43 0e 44 0e | 45 0e 46 0e 47 0e 48 0e |A.B.C.D.|E.F.G.H.|
|00004490| 3b 0e 37 0e 3e 26 0b 43 | a4 16 09 2e 14 29 82 75 |;.7.>&.C|.....).u|
|000044a0| 01 29 82 28 04 0e 1d de | 3d 84 28 04 df 0e 20 21 |.).(....|=.(... !|
|000044b0| 88 29 0e 09 2e 5c 66 87 | 22 20 5b 65 64 69 66 66 |.)...\f.|" [ediff|
|000044c0| 2d 62 75 66 66 65 72 2d | 41 20 65 64 69 66 66 2d |-buffer-|A ediff-|
|000044d0| 62 75 66 66 65 72 2d 42 | 20 65 64 69 66 66 2d 62 |buffer-B| ediff-b|
|000044e0| 75 66 66 65 72 2d 43 20 | 65 64 69 66 66 2d 61 6e |uffer-C |ediff-an|
|000044f0| 63 65 73 74 6f 72 2d 62 | 75 66 66 65 72 20 31 20 |cestor-b|uffer 1 |
|00004500| 6e 69 6c 20 73 68 69 66 | 74 2d 43 20 73 68 69 66 |nil shif|t-C shif|
|00004510| 74 2d 42 20 73 68 69 66 | 74 2d 41 20 64 69 66 66 |t-B shif|t-A diff|
|00004520| 2d 6c 69 73 74 20 61 6e | 63 2d 70 72 65 76 20 63 |-list an|c-prev c|
|00004530| 2d 70 72 65 76 20 62 2d | 70 72 65 76 20 61 2d 70 |-prev b-|prev a-p|
|00004540| 72 65 76 20 61 6e 63 2d | 62 75 66 66 65 72 20 43 |rev anc-|buffer C|
|00004550| 2d 62 75 66 66 65 72 20 | 42 2d 62 75 66 66 65 72 |-buffer |B-buffer|
|00004560| 20 41 2d 62 75 66 66 65 | 72 20 77 6f 72 64 2d 6d | A-buffe|r word-m|
|00004570| 6f 64 65 20 77 6f 72 64 | 73 20 70 6f 69 6e 74 73 |ode word|s points|
|00004580| 20 62 6f 75 6e 64 73 20 | 65 64 69 66 66 2d 6f 76 | bounds |ediff-ov|
|00004590| 65 72 6c 61 79 2d 73 74 | 61 72 74 20 74 68 72 65 |erlay-st|art thre|
|000045a0| 65 2d 77 61 79 2d 63 6f | 6d 70 20 32 20 53 74 61 |e-way-co|mp 2 Sta|
|000045b0| 72 74 42 75 66 66 65 72 | 20 67 65 74 2d 62 75 66 |rtBuffer| get-buf|
|000045c0| 66 65 72 20 62 75 66 66 | 65 72 2d 6e 61 6d 65 20 |fer buff|er-name |
|000045d0| 28 28 73 65 74 2d 62 75 | 66 66 65 72 20 53 74 61 |((set-bu|ffer Sta|
|000045e0| 72 74 42 75 66 66 65 72 | 29 29 20 74 68 69 73 2d |rtBuffer|)) this-|
|000045f0| 63 6f 6d 6d 61 6e 64 20 | 65 64 69 66 66 2d 71 75 |command |ediff-qu|
|00004600| 69 74 20 65 72 72 6f 72 | 20 65 64 69 66 66 2d 4b |it error| ediff-K|
|00004610| 49 4c 4c 45 44 2d 56 49 | 54 41 4c 2d 42 55 46 46 |ILLED-VI|TAL-BUFF|
|00004620| 45 52 20 28 28 73 65 74 | 2d 62 75 66 66 65 72 20 |ER ((set|-buffer |
|00004630| 53 74 61 72 74 42 75 66 | 66 65 72 29 29 20 28 28 |StartBuf|fer)) ((|
|00004640| 73 65 74 2d 62 75 66 66 | 65 72 20 53 74 61 72 74 |set-buff|er Start|
|00004650| 42 75 66 66 65 72 29 29 | 20 28 28 73 65 74 2d 62 |Buffer))| ((set-b|
|00004660| 75 66 66 65 72 20 53 74 | 61 72 74 42 75 66 66 65 |uffer St|artBuffe|
|00004670| 72 29 29 20 64 69 66 66 | 2d 62 75 66 66 65 72 20 |r)) diff|-buffer |
|00004680| 28 28 73 65 74 2d 62 75 | 66 66 65 72 20 53 74 61 |((set-bu|ffer Sta|
|00004690| 72 74 42 75 66 66 65 72 | 29 29 20 72 65 2d 73 65 |rtBuffer|)) re-se|
|000046a0| 61 72 63 68 2d 66 6f 72 | 77 61 72 64 20 65 64 69 |arch-for|ward edi|
|000046b0| 66 66 2d 6d 61 74 63 68 | 2d 64 69 66 66 33 2d 6c |ff-match|-diff3-l|
|000046c0| 69 6e 65 20 74 20 61 67 | 72 65 65 6d 65 6e 74 20 |ine t ag|reement |
|000046d0| 22 33 22 20 65 64 69 66 | 66 2d 67 65 74 2d 64 69 |"3" edif|f-get-di|
|000046e0| 66 66 33 2d 67 72 6f 75 | 70 20 22 31 22 20 61 2d |ff3-grou|p "1" a-|
|000046f0| 62 65 67 69 6e 20 61 2d | 65 6e 64 20 22 32 22 20 |begin a-|end "2" |
|00004700| 62 2d 62 65 67 69 6e 20 | 62 2d 65 6e 64 20 63 2d |b-begin |b-end c-|
|00004710| 6f 72 2d 61 6e 63 2d 62 | 65 67 69 6e 20 63 2d 6f |or-anc-b|egin c-o|
|00004720| 72 2d 61 6e 63 2d 65 6e | 64 20 70 72 65 66 65 72 |r-anc-en|d prefer|
|00004730| 2d 41 20 70 72 65 66 65 | 72 2d 42 20 65 64 69 66 |-A prefe|r-B edif|
|00004740| 66 2d 64 65 66 61 75 6c | 74 2d 76 61 72 69 61 6e |f-defaul|t-varian|
|00004750| 74 20 73 74 61 74 65 2d | 6f 66 2d 6d 65 72 67 65 |t state-|of-merge|
|00004760| 20 28 64 65 66 61 75 6c | 74 2d 41 20 70 72 65 66 | (defaul|t-A pref|
|00004770| 65 72 2d 41 29 20 42 20 | 41 20 73 74 61 74 65 2d |er-A) B |A state-|
|00004780| 6f 66 2d 64 69 66 66 2d | 6d 65 72 67 65 20 43 20 |of-diff-|merge C |
|00004790| 73 74 61 74 65 2d 6f 66 | 2d 64 69 66 66 2d 63 6f |state-of|-diff-co|
|000047a0| 6d 70 61 72 69 73 6f 6e | 20 73 74 61 74 65 2d 6f |mparison| state-o|
|000047b0| 66 2d 61 6e 63 65 73 74 | 6f 72 20 63 2d 62 65 67 |f-ancest|or c-beg|
|000047c0| 69 6e 20 63 2d 65 6e 64 | 20 61 2d 62 65 67 69 6e |in c-end| a-begin|
|000047d0| 2d 70 74 20 61 2d 65 6e | 64 2d 70 74 20 62 2d 62 |-pt a-en|d-pt b-b|
|000047e0| 65 67 69 6e 2d 70 74 20 | 62 2d 65 6e 64 2d 70 74 |egin-pt |b-end-pt|
|000047f0| 20 63 2d 62 65 67 69 6e | 2d 70 74 20 63 2d 65 6e | c-begin|-pt c-en|
|00004800| 64 2d 70 74 20 61 6e 63 | 2d 62 65 67 69 6e 2d 70 |d-pt anc|-begin-p|
|00004810| 74 20 61 6e 63 2d 65 6e | 64 2d 70 74 20 64 65 66 |t anc-en|d-pt def|
|00004820| 61 75 6c 74 2d 42 20 76 | 65 63 74 6f 72 20 28 28 |ault-B v|ector ((|
|00004830| 73 65 74 2d 62 75 66 66 | 65 72 20 53 74 61 72 74 |set-buff|er Start|
|00004840| 42 75 66 66 65 72 29 29 | 20 28 28 73 65 74 2d 62 |Buffer))| ((set-b|
|00004850| 75 66 66 65 72 20 53 74 | 61 72 74 42 75 66 66 65 |uffer St|artBuffe|
|00004860| 72 29 29 20 28 28 73 65 | 74 2d 62 75 66 66 65 72 |r)) ((se|t-buffer|
|00004870| 20 53 74 61 72 74 42 75 | 66 66 65 72 29 29 20 28 | StartBu|ffer)) (|
|00004880| 28 73 65 74 2d 62 75 66 | 66 65 72 20 53 74 61 72 |(set-buf|fer Star|
|00004890| 74 42 75 66 66 65 72 29 | 29 5d 20 31 34 5d 29 0a |tBuffer)|)] 14]).|
|000048a0| 28 64 65 66 61 6c 69 61 | 73 20 27 65 64 69 66 66 |(defalia|s 'ediff|
|000048b0| 2d 73 65 74 75 70 2d 64 | 69 66 66 2d 72 65 67 69 |-setup-d|iff-regi|
|000048c0| 6f 6e 73 33 20 23 5b 28 | 66 69 6c 65 2d 41 20 66 |ons3 #[(|file-A f|
|000048d0| 69 6c 65 2d 42 20 66 69 | 6c 65 2d 43 29 20 22 08 |ile-B fi|le-C) ".|
|000048e0| 83 12 00 c1 08 21 83 12 | 00 c2 c1 08 21 21 84 19 |.....!..|....!!..|
|000048f0| 00 c3 c4 c5 c6 5c 22 21 | 10 c7 c8 21 88 c9 0e 5c |.....\"!|...!...\|
|00004900| 6e 08 cb 0e 5c 66 0e 0d | 0e 0e 0e 0f 26 07 88 d0 |n...\f..|....&...|
|00004910| 0e 11 08 5c 22 88 d2 d3 | 08 0e 14 0e 15 0e 16 24 |...\"...|.......$|
|00004920| 21 87 22 20 5b 65 64 69 | 66 66 2d 64 69 66 66 2d |!." [edi|ff-diff-|
|00004930| 62 75 66 66 65 72 20 67 | 65 74 2d 62 75 66 66 65 |buffer g|et-buffe|
|00004940| 72 20 62 75 66 66 65 72 | 2d 6e 61 6d 65 20 67 65 |r buffer|-name ge|
|00004950| 74 2d 62 75 66 66 65 72 | 2d 63 72 65 61 74 65 20 |t-buffer|-create |
|00004960| 65 64 69 66 66 2d 75 6e | 69 71 75 65 2d 62 75 66 |ediff-un|ique-buf|
|00004970| 66 65 72 2d 6e 61 6d 65 | 20 22 2a 65 64 69 66 66 |fer-name| "*ediff|
|00004980| 2d 64 69 66 66 22 20 22 | 2a 22 20 6d 65 73 73 61 |-diff" "|*" messa|
|00004990| 67 65 20 22 43 6f 6d 70 | 75 74 69 6e 67 20 64 69 |ge "Comp|uting di|
|000049a0| 66 66 65 72 65 6e 63 65 | 73 20 2e 2e 2e 22 20 65 |fference|s ..." e|
|000049b0| 64 69 66 66 2d 65 78 65 | 63 2d 70 72 6f 63 65 73 |diff-exe|c-proces|
|000049c0| 73 20 65 64 69 66 66 2d | 64 69 66 66 33 2d 70 72 |s ediff-|diff3-pr|
|000049d0| 6f 67 72 61 6d 20 73 79 | 6e 63 68 72 6f 6e 69 7a |ogram sy|nchroniz|
|000049e0| 65 20 65 64 69 66 66 2d | 64 69 66 66 33 2d 6f 70 |e ediff-|diff3-op|
|000049f0| 74 69 6f 6e 73 20 66 69 | 6c 65 2d 41 20 66 69 6c |tions fi|le-A fil|
|00004a00| 65 2d 42 20 66 69 6c 65 | 2d 43 20 65 64 69 66 66 |e-B file|-C ediff|
|00004a10| 2d 70 72 65 70 61 72 65 | 2d 65 72 72 6f 72 2d 6c |-prepare|-error-l|
|00004a20| 69 73 74 20 65 64 69 66 | 66 2d 64 69 66 66 33 2d |ist edif|f-diff3-|
|00004a30| 6f 6b 2d 6c 69 6e 65 73 | 2d 72 65 67 65 78 70 20 |ok-lines|-regexp |
|00004a40| 65 64 69 66 66 2d 63 6f | 6e 76 65 72 74 2d 64 69 |ediff-co|nvert-di|
|00004a50| 66 66 73 2d 74 6f 2d 6f | 76 65 72 6c 61 79 73 20 |ffs-to-o|verlays |
|00004a60| 65 64 69 66 66 2d 65 78 | 74 72 61 63 74 2d 64 69 |ediff-ex|tract-di|
|00004a70| 66 66 73 33 20 65 64 69 | 66 66 2d 77 6f 72 64 2d |ffs3 edi|ff-word-|
|00004a80| 6d 6f 64 65 20 65 64 69 | 66 66 2d 33 77 61 79 2d |mode edi|ff-3way-|
|00004a90| 63 6f 6d 70 61 72 69 73 | 6f 6e 2d 6a 6f 62 20 65 |comparis|on-job e|
|00004aa0| 64 69 66 66 2d 6e 61 72 | 72 6f 77 2d 62 6f 75 6e |diff-nar|row-boun|
|00004ab0| 64 73 5d 20 38 5d 29 0a | 28 64 65 66 61 6c 69 61 |ds] 8]).|(defalia|
|00004ac0| 73 20 27 65 64 69 66 66 | 2d 65 78 65 63 2d 70 72 |s 'ediff|-exec-pr|
|00004ad0| 6f 63 65 73 73 20 23 5b | 28 70 72 6f 67 72 61 6d |ocess #[|(program|
|00004ae0| 20 62 75 66 66 65 72 20 | 73 79 6e 63 68 20 26 72 | buffer |synch &r|
|00004af0| 65 73 74 20 61 72 67 73 | 29 20 22 c0 20 19 c2 c3 |est args|) ". ...|
|00004b00| 5c 66 40 5c 22 83 0e 00 | 5c 66 41 14 c5 c6 5c 66 |\f@\"...|\fA...\f|
|00004b10| 5c 22 14 c7 c8 c9 5c 66 | ca 23 21 14 cb 8e 0e 5c |\"....\f|.#!....\|
|00004b20| 66 c6 1e 0d 1e 0e 8a 0e | 0f 71 88 d0 20 88 0e 0e |f.......|.q.. ...|
|00004b30| 16 5c 66 0e 11 d2 3e 84 | 3c 00 0e 13 83 4a 00 d4 |.\f...>.|<....J..|
|00004b40| d5 0e 16 c6 0e 0f c6 5c | 66 26 06 82 72 00 d7 0e |.......\|f&..r...|
|00004b50| 0f 21 89 16 0d 83 59 00 | d8 0e 0d 21 88 d4 d9 da |.!....Y.|...!....|
|00004b60| 0e 0f 0e 16 5c 66 25 16 | 0d db 16 1c dd 0e 0d de |....\f%.|........|
|00004b70| 5c 22 88 df 0e 0d e0 5c | 22 2d 87 22 20 5b 6d 61 |\".....\|"-." [ma|
|00004b80| 74 63 68 2d 64 61 74 61 | 20 64 61 74 61 20 73 74 |tch-data| data st|
|00004b90| 72 69 6e 67 2d 6d 61 74 | 63 68 20 22 5e 5b 20 09 |ring-mat|ch "^[ .|
|00004ba0| 5d 2a 24 22 20 61 72 67 | 73 20 64 65 6c 71 20 6e |]*$" arg|s delq n|
|00004bb0| 69 6c 20 65 64 69 66 66 | 2d 73 70 6c 69 74 2d 73 |il ediff|-split-s|
|00004bc0| 74 72 69 6e 67 20 6d 61 | 70 63 6f 6e 63 61 74 20 |tring ma|pconcat |
|00004bd0| 69 64 65 6e 74 69 74 79 | 20 22 20 22 20 28 28 73 |identity| " " ((s|
|00004be0| 74 6f 72 65 2d 6d 61 74 | 63 68 2d 64 61 74 61 20 |tore-mat|ch-data |
|00004bf0| 64 61 74 61 29 29 20 64 | 65 66 61 75 6c 74 2d 64 |data)) d|efault-d|
|00004c00| 69 72 65 63 74 6f 72 79 | 20 70 72 6f 63 20 64 69 |irectory| proc di|
|00004c10| 72 65 63 74 6f 72 79 20 | 62 75 66 66 65 72 20 65 |rectory |buffer e|
|00004c20| 72 61 73 65 2d 62 75 66 | 66 65 72 20 73 79 73 74 |rase-buf|fer syst|
|00004c30| 65 6d 2d 74 79 70 65 20 | 28 65 6d 78 20 6d 73 2d |em-type |(emx ms-|
|00004c40| 64 6f 73 20 77 69 6e 64 | 6f 77 73 2d 6e 74 20 77 |dos wind|ows-nt w|
|00004c50| 69 6e 64 6f 77 73 2d 39 | 35 29 20 73 79 6e 63 68 |indows-9|5) synch|
|00004c60| 20 61 70 70 6c 79 20 63 | 61 6c 6c 2d 70 72 6f 63 | apply c|all-proc|
|00004c70| 65 73 73 20 70 72 6f 67 | 72 61 6d 20 67 65 74 2d |ess prog|ram get-|
|00004c80| 62 75 66 66 65 72 2d 70 | 72 6f 63 65 73 73 20 6b |buffer-p|rocess k|
|00004c90| 69 6c 6c 2d 70 72 6f 63 | 65 73 73 20 73 74 61 72 |ill-proc|ess star|
|00004ca0| 74 2d 70 72 6f 63 65 73 | 73 20 22 43 75 73 74 6f |t-proces|s "Custo|
|00004cb0| 6d 20 44 69 66 66 22 20 | 28 22 3a 25 73 22 29 20 |m Diff" |(":%s") |
|00004cc0| 6d 6f 64 65 2d 6c 69 6e | 65 2d 70 72 6f 63 65 73 |mode-lin|e-proces|
|00004cd0| 73 20 73 65 74 2d 70 72 | 6f 63 65 73 73 2d 73 65 |s set-pr|ocess-se|
|00004ce0| 6e 74 69 6e 65 6c 20 65 | 64 69 66 66 2d 70 72 6f |ntinel e|diff-pro|
|00004cf0| 63 65 73 73 2d 73 65 6e | 74 69 6e 65 6c 20 73 65 |cess-sen|tinel se|
|00004d00| 74 2d 70 72 6f 63 65 73 | 73 2d 66 69 6c 74 65 72 |t-proces|s-filter|
|00004d10| 20 65 64 69 66 66 2d 70 | 72 6f 63 65 73 73 2d 66 | ediff-p|rocess-f|
|00004d20| 69 6c 74 65 72 5d 20 38 | 5d 29 0a 28 64 65 66 61 |ilter] 8|]).(defa|
|00004d30| 6c 69 61 73 20 27 65 64 | 69 66 66 2d 70 72 6f 63 |lias 'ed|iff-proc|
|00004d40| 65 73 73 2d 66 69 6c 74 | 65 72 20 23 5b 28 70 72 |ess-filt|er #[(pr|
|00004d50| 6f 63 20 73 74 72 69 6e | 67 29 20 22 70 18 c1 5c |oc strin|g) "p..\|
|00004d60| 6e 21 1b c4 1d c6 0b 21 | 1e 07 c8 0e 07 21 1e 09 |n!.....!|.....!..|
|00004d70| ca 8e 0b 71 88 60 64 55 | 84 20 00 60 15 64 62 88 |...q.`dU|. .`.db.|
|00004d80| cb 0e 5c 66 21 2e 06 87 | 22 20 5b 6f 62 75 66 20 |..\f!...|" [obuf |
|00004d90| 70 72 6f 63 65 73 73 2d | 62 75 66 66 65 72 20 70 |process-|buffer p|
|00004da0| 72 6f 63 20 62 75 66 66 | 65 72 20 6e 69 6c 20 6f |roc buff|er nil o|
|00004db0| 70 6f 69 6e 74 20 67 65 | 74 2d 62 75 66 66 65 72 |point ge|t-buffer|
|00004dc0| 2d 77 69 6e 64 6f 77 20 | 77 69 6e 64 6f 77 20 77 |-window |window w|
|00004dd0| 69 6e 64 6f 77 2d 73 74 | 61 72 74 20 70 6f 73 20 |indow-st|art pos |
|00004de0| 28 28 62 79 74 65 2d 63 | 6f 64 65 20 22 c0 09 5c |((byte-c|ode "..\|
|00004df0| 6e 5c 22 88 0b 83 5c 66 | 00 0b 62 88 5c 66 71 87 |n\"...\f|..b.\fq.|
|00004e00| 22 20 5b 73 65 74 2d 77 | 69 6e 64 6f 77 2d 73 74 |" [set-w|indow-st|
|00004e10| 61 72 74 20 77 69 6e 64 | 6f 77 20 70 6f 73 20 6f |art wind|ow pos o|
|00004e20| 70 6f 69 6e 74 20 6f 62 | 75 66 5d 20 33 29 29 20 |point ob|uf] 3)) |
|00004e30| 69 6e 73 65 72 74 2d 62 | 65 66 6f 72 65 2d 6d 61 |insert-b|efore-ma|
|00004e40| 72 6b 65 72 73 20 73 74 | 72 69 6e 67 5d 20 32 5d |rkers st|ring] 2]|
|00004e50| 29 0a 28 64 65 66 61 6c | 69 61 73 20 27 65 64 69 |).(defal|ias 'edi|
|00004e60| 66 66 2d 70 72 6f 63 65 | 73 73 2d 73 65 6e 74 69 |ff-proce|ss-senti|
|00004e70| 6e 65 6c 20 23 5b 28 70 | 72 6f 63 65 73 73 20 73 |nel #[(p|rocess s|
|00004e80| 69 67 6e 61 6c 29 20 22 | c0 09 21 c2 3e 85 1d 00 |ignal) "|..!.>...|
|00004e90| c3 c4 09 21 21 85 1d 00 | 8a c4 09 21 71 88 c5 16 |...!!...|...!q...|
|00004ea0| 06 29 c7 09 21 87 22 20 | 5b 70 72 6f 63 65 73 73 |.)..!." |[process|
|00004eb0| 2d 73 74 61 74 75 73 20 | 70 72 6f 63 65 73 73 20 |-status |process |
|00004ec0| 28 65 78 69 74 20 73 69 | 67 6e 61 6c 29 20 62 75 |(exit si|gnal) bu|
|00004ed0| 66 66 65 72 2d 6e 61 6d | 65 20 70 72 6f 63 65 73 |ffer-nam|e proces|
|00004ee0| 73 2d 62 75 66 66 65 72 | 20 6e 69 6c 20 6d 6f 64 |s-buffer| nil mod|
|00004ef0| 65 2d 6c 69 6e 65 2d 70 | 72 6f 63 65 73 73 20 64 |e-line-p|rocess d|
|00004f00| 65 6c 65 74 65 2d 70 72 | 6f 63 65 73 73 5d 20 33 |elete-pr|ocess] 3|
|00004f10| 5d 29 0a 23 40 31 30 36 | 20 2a 46 75 6e 63 74 69 |]).#@106| *Functi|
|00004f20| 6f 6e 20 74 6f 20 63 61 | 6c 6c 20 74 6f 20 6d 6f |on to ca|ll to mo|
|00004f30| 76 65 20 74 6f 20 74 68 | 65 20 6e 65 78 74 20 77 |ve to th|e next w|
|00004f40| 6f 72 64 2e 0a 55 73 65 | 64 20 66 6f 72 20 73 70 |ord..Use|d for sp|
|00004f50| 6c 69 74 74 69 6e 67 20 | 64 69 66 66 65 72 65 6e |litting |differen|
|00004f60| 63 65 20 72 65 67 69 6f | 6e 73 20 69 6e 74 6f 20 |ce regio|ns into |
|00004f70| 69 6e 64 69 76 69 64 75 | 61 6c 20 77 6f 72 64 73 |individu|al words|
|00004f80| 2e 1f 0a 28 64 65 66 76 | 61 72 20 65 64 69 66 66 |...(defv|ar ediff|
|00004f90| 2d 66 6f 72 77 61 72 64 | 2d 77 6f 72 64 2d 66 75 |-forward|-word-fu|
|00004fa0| 6e 63 74 69 6f 6e 20 28 | 71 75 6f 74 65 20 65 64 |nction (|quote ed|
|00004fb0| 69 66 66 2d 66 6f 72 77 | 61 72 64 2d 77 6f 72 64 |iff-forw|ard-word|
|00004fc0| 29 20 28 23 24 20 2e 20 | 2d 32 30 32 34 39 29 29 |) (#$ . |-20249))|
|00004fd0| 0a 23 40 31 31 33 20 2a | 43 68 61 72 61 63 74 65 |.#@113 *|Characte|
|00004fe0| 72 73 20 63 6f 6e 73 74 | 69 74 75 74 69 6e 67 20 |rs const|ituting |
|00004ff0| 77 68 69 74 65 20 73 70 | 61 63 65 2e 0a 54 68 65 |white sp|ace..The|
|00005000| 73 65 20 63 68 61 72 61 | 63 74 65 72 73 20 61 72 |se chara|cters ar|
|00005010| 65 20 69 67 6e 6f 72 65 | 64 20 77 68 65 6e 20 64 |e ignore|d when d|
|00005020| 69 66 66 65 72 69 6e 67 | 20 72 65 67 69 6f 6e 73 |iffering| regions|
|00005030| 20 61 72 65 20 73 70 6c | 69 74 20 69 6e 74 6f 20 | are spl|it into |
|00005040| 77 6f 72 64 73 2e 1f 0a | 28 64 65 66 76 61 72 20 |words...|(defvar |
|00005050| 65 64 69 66 66 2d 77 68 | 69 74 65 73 70 61 63 65 |ediff-wh|itespace|
|00005060| 20 22 20 5c 6e 09 5c 66 | 22 20 28 23 24 20 2e 20 | " \n.\f|" (#$ . |
|00005070| 2d 32 30 34 33 39 29 29 | 0a 23 40 31 35 39 20 2a |-20439))|.#@159 *|
|00005080| 43 68 61 72 61 63 74 65 | 72 73 20 74 68 61 74 20 |Characte|rs that |
|00005090| 63 6f 6e 73 74 69 74 75 | 74 65 20 77 6f 72 64 73 |constitu|te words|
|000050a0| 20 6f 66 20 74 79 70 65 | 20 31 2e 0a 4d 6f 72 65 | of type| 1..More|
|000050b0| 20 70 72 65 63 69 73 65 | 6c 79 2c 20 5b 65 64 69 | precise|ly, [edi|
|000050c0| 66 66 2d 77 6f 72 64 2d | 31 5d 20 69 73 20 61 20 |ff-word-|1] is a |
|000050d0| 72 65 67 65 78 70 20 74 | 68 61 74 20 6d 61 74 63 |regexp t|hat matc|
|000050e0| 68 65 73 20 74 79 70 65 | 20 31 20 77 6f 72 64 73 |hes type| 1 words|
|000050f0| 2e 0a 53 65 65 20 60 65 | 64 69 66 66 2d 66 6f 72 |..See `e|diff-for|
|00005100| 77 61 72 64 2d 77 6f 72 | 64 27 20 66 6f 72 20 6d |ward-wor|d' for m|
|00005110| 6f 72 65 20 64 65 74 61 | 69 6c 73 2e 1f 0a 28 64 |ore deta|ils...(d|
|00005120| 65 66 76 61 72 20 65 64 | 69 66 66 2d 77 6f 72 64 |efvar ed|iff-word|
|00005130| 2d 31 20 22 61 2d 7a 41 | 2d 5a 2d 2d 2d 5f 22 20 |-1 "a-zA|-Z---_" |
|00005140| 28 23 24 20 2e 20 2d 32 | 30 36 30 37 29 29 0a 23 |(#$ . -2|0607)).#|
|00005150| 40 31 35 39 20 2a 43 68 | 61 72 61 63 74 65 72 73 |@159 *Ch|aracters|
|00005160| 20 74 68 61 74 20 63 6f | 6e 73 74 69 74 75 74 65 | that co|nstitute|
|00005170| 20 77 6f 72 64 73 20 6f | 66 20 74 79 70 65 20 32 | words o|f type 2|
|00005180| 2e 0a 4d 6f 72 65 20 70 | 72 65 63 69 73 65 6c 79 |..More p|recisely|
|00005190| 2c 20 5b 65 64 69 66 66 | 2d 77 6f 72 64 2d 32 5d |, [ediff|-word-2]|
|000051a0| 20 69 73 20 61 20 72 65 | 67 65 78 70 20 74 68 61 | is a re|gexp tha|
|000051b0| 74 20 6d 61 74 63 68 65 | 73 20 74 79 70 65 20 32 |t matche|s type 2|
|000051c0| 20 77 6f 72 64 73 2e 0a | 53 65 65 20 60 65 64 69 | words..|See `edi|
|000051d0| 66 66 2d 66 6f 72 77 61 | 72 64 2d 77 6f 72 64 27 |ff-forwa|rd-word'|
|000051e0| 20 66 6f 72 20 6d 6f 72 | 65 20 64 65 74 61 69 6c | for mor|e detail|
|000051f0| 73 2e 1f 0a 28 64 65 66 | 76 61 72 20 65 64 69 66 |s...(def|var edif|
|00005200| 66 2d 77 6f 72 64 2d 32 | 20 22 30 2d 39 2e 2c 22 |f-word-2| "0-9.,"|
|00005210| 20 28 23 24 20 2e 20 2d | 32 30 38 32 31 29 29 0a | (#$ . -|20821)).|
|00005220| 23 40 31 35 39 20 2a 43 | 68 61 72 61 63 74 65 72 |#@159 *C|haracter|
|00005230| 73 20 74 68 61 74 20 63 | 6f 6e 73 74 69 74 75 74 |s that c|onstitut|
|00005240| 65 20 77 6f 72 64 73 20 | 6f 66 20 74 79 70 65 20 |e words |of type |
|00005250| 33 2e 0a 4d 6f 72 65 20 | 70 72 65 63 69 73 65 6c |3..More |precisel|
|00005260| 79 2c 20 5b 65 64 69 66 | 66 2d 77 6f 72 64 2d 33 |y, [edif|f-word-3|
|00005270| 5d 20 69 73 20 61 20 72 | 65 67 65 78 70 20 74 68 |] is a r|egexp th|
|00005280| 61 74 20 6d 61 74 63 68 | 65 73 20 74 79 70 65 20 |at match|es type |
|00005290| 33 20 77 6f 72 64 73 2e | 0a 53 65 65 20 60 65 64 |3 words.|.See `ed|
|000052a0| 69 66 66 2d 66 6f 72 77 | 61 72 64 2d 77 6f 72 64 |iff-forw|ard-word|
|000052b0| 27 20 66 6f 72 20 6d 6f | 72 65 20 64 65 74 61 69 |' for mo|re detai|
|000052c0| 6c 73 2e 1f 0a 28 64 65 | 66 76 61 72 20 65 64 69 |ls...(de|fvar edi|
|000052d0| 66 66 2d 77 6f 72 64 2d | 33 20 22 60 27 3f 21 3a |ff-word-|3 "`'?!:|
|000052e0| 3b 5c 22 7b 7d 5b 5d 28 | 29 22 20 28 23 24 20 2e |;\"{}[](|)" (#$ .|
|000052f0| 20 2d 32 31 30 33 30 29 | 29 0a 23 40 31 35 39 20 | -21030)|).#@159 |
|00005300| 2a 43 68 61 72 61 63 74 | 65 72 73 20 74 68 61 74 |*Charact|ers that|
|00005310| 20 63 6f 6e 73 74 69 74 | 75 74 65 20 77 6f 72 64 | constit|ute word|
|00005320| 73 20 6f 66 20 74 79 70 | 65 20 34 2e 0a 4d 6f 72 |s of typ|e 4..Mor|
|00005330| 65 20 70 72 65 63 69 73 | 65 6c 79 2c 20 5b 65 64 |e precis|ely, [ed|
|00005340| 69 66 66 2d 77 6f 72 64 | 2d 34 5d 20 69 73 20 61 |iff-word|-4] is a|
|00005350| 20 72 65 67 65 78 70 20 | 74 68 61 74 20 6d 61 74 | regexp |that mat|
|00005360| 63 68 65 73 20 74 79 70 | 65 20 34 20 77 6f 72 64 |ches typ|e 4 word|
|00005370| 73 2e 0a 53 65 65 20 60 | 65 64 69 66 66 2d 66 6f |s..See `|ediff-fo|
|00005380| 72 77 61 72 64 2d 77 6f | 72 64 27 20 66 6f 72 20 |rward-wo|rd' for |
|00005390| 6d 6f 72 65 20 64 65 74 | 61 69 6c 73 2e 1f 0a 28 |more det|ails...(|
|000053a0| 64 65 66 76 61 72 20 65 | 64 69 66 66 2d 77 6f 72 |defvar e|diff-wor|
|000053b0| 64 2d 34 20 28 63 6f 6e | 63 61 74 20 22 5e 22 20 |d-4 (con|cat "^" |
|000053c0| 65 64 69 66 66 2d 77 6f | 72 64 2d 31 20 65 64 69 |ediff-wo|rd-1 edi|
|000053d0| 66 66 2d 77 6f 72 64 2d | 32 20 65 64 69 66 66 2d |ff-word-|2 ediff-|
|000053e0| 77 6f 72 64 2d 33 20 65 | 64 69 66 66 2d 77 68 69 |word-3 e|diff-whi|
|000053f0| 74 65 73 70 61 63 65 29 | 20 28 23 24 20 2e 20 2d |tespace)| (#$ . -|
|00005400| 32 31 32 34 38 29 29 0a | 23 40 32 36 35 20 4d 6f |21248)).|#@265 Mo|
|00005410| 76 65 20 70 6f 69 6e 74 | 20 6f 6e 65 20 77 6f 72 |ve point| one wor|
|00005420| 64 20 66 6f 72 77 61 72 | 64 2e 0a 54 68 65 72 65 |d forwar|d..There|
|00005430| 20 61 72 65 20 66 6f 75 | 72 20 74 79 70 65 73 20 | are fou|r types |
|00005440| 6f 66 20 77 6f 72 64 73 | 2c 20 65 61 63 68 20 6f |of words|, each o|
|00005450| 66 20 77 68 69 63 68 20 | 63 6f 6e 73 69 73 74 73 |f which |consists|
|00005460| 20 65 6e 74 69 72 65 6c | 79 20 6f 66 0a 63 68 61 | entirel|y of.cha|
|00005470| 72 61 63 74 65 72 73 20 | 69 6e 20 60 65 64 69 66 |racters |in `edif|
|00005480| 66 2d 77 6f 72 64 2d 31 | 27 2c 20 60 65 64 69 66 |f-word-1|', `edif|
|00005490| 66 2d 77 6f 72 64 2d 32 | 27 2c 20 60 65 64 69 66 |f-word-2|', `edif|
|000054a0| 66 2d 77 6f 72 64 2d 33 | 27 2c 20 6f 72 0a 60 65 |f-word-3|', or.`e|
|000054b0| 64 69 66 66 2d 77 6f 72 | 64 2d 34 27 2e 20 20 57 |diff-wor|d-4'.  W|
|000054c0| 6f 72 64 73 20 61 72 65 | 20 72 65 63 6f 67 6e 69 |ords are| recogni|
|000054d0| 7a 65 64 20 62 79 20 70 | 61 73 73 69 6e 67 20 74 |zed by p|assing t|
|000054e0| 68 65 73 65 20 69 6e 20 | 74 75 72 6e 20 61 73 20 |hese in |turn as |
|000054f0| 74 68 65 0a 61 72 67 75 | 6d 65 6e 74 20 74 6f 20 |the.argu|ment to |
|00005500| 60 73 6b 69 70 2d 63 68 | 61 72 73 2d 66 6f 72 77 |`skip-ch|ars-forw|
|00005510| 61 72 64 27 2e 1f 0a 28 | 64 65 66 61 6c 69 61 73 |ard'...(|defalias|
|00005520| 20 27 65 64 69 66 66 2d | 66 6f 72 77 61 72 64 2d | 'ediff-|forward-|
|00005530| 77 6f 72 64 20 23 5b 6e | 69 6c 20 22 08 c1 77 c2 |word #[n|il "..w.|
|00005540| 56 86 1d 00 0b c1 77 c2 | 56 86 1d 00 5c 66 c1 77 |V.....w.|V...\f.w|
|00005550| c2 56 86 1d 00 0d c1 77 | c2 56 87 22 20 5b 65 64 |.V.....w|.V." [ed|
|00005560| 69 66 66 2d 77 6f 72 64 | 2d 31 20 6e 69 6c 20 30 |iff-word|-1 nil 0|
|00005570| 20 65 64 69 66 66 2d 77 | 6f 72 64 2d 32 20 65 64 | ediff-w|ord-2 ed|
|00005580| 69 66 66 2d 77 6f 72 64 | 2d 33 20 65 64 69 66 66 |iff-word|-3 ediff|
|00005590| 2d 77 6f 72 64 2d 34 5d | 20 32 20 28 23 24 20 2e |-word-4]| 2 (#$ .|
|000055a0| 20 32 31 35 31 38 29 5d | 29 0a 28 64 65 66 61 6c | 21518)]|).(defal|
|000055b0| 69 61 73 20 27 65 64 69 | 66 66 2d 77 6f 72 64 69 |ias 'edi|ff-wordi|
|000055c0| 66 79 20 23 5b 28 62 65 | 67 20 65 6e 64 20 69 6e |fy #[(be|g end in|
|000055d0| 2d 62 75 66 66 65 72 20 | 6f 75 74 2d 62 75 66 66 |-buffer |out-buff|
|000055e0| 65 72 20 26 6f 70 74 69 | 6f 6e 61 6c 20 63 6f 6e |er &opti|onal con|
|000055f0| 74 72 6f 6c 2d 62 75 66 | 29 20 22 c0 89 19 1a 8a |trol-buf|) ".....|
|00005600| 0b 71 88 5c 66 0d 7b 11 | 0e 06 71 88 c7 20 88 09 |.q.\f.{.|..q.. ..|
|00005610| 63 88 65 62 88 0e 08 c0 | 77 88 65 60 7c 88 6d 3f |c.eb....|w.e`|.m?|
|00005620| 85 76 00 0e 09 83 61 00 | 70 1e 5c 6e 0e 09 83 50 |.v....a.|p.\n...P|
|00005630| 00 cb 0e 09 21 83 50 00 | cc cb 0e 09 21 21 83 50 |....!.P.|....!!.P|
|00005640| 00 cd 8e 0e 09 71 88 0e | 0e 29 82 5b 00 0e 0f d0 |.....q..|.).[....|
|00005650| 3d 86 5b 00 d1 0e 12 21 | 29 20 88 82 65 00 0e 0e |=.[....!|) ..e...|
|00005660| 20 88 60 12 0e 08 c0 77 | 88 5c 6e 60 7c 88 d3 63 | .`....w|.\n`|..c|
|00005670| 88 82 5c 22 00 2b 87 22 | 20 5b 6e 69 6c 20 73 74 |..\".+."| [nil st|
|00005680| 72 69 6e 67 20 73 76 2d | 70 6f 69 6e 74 20 69 6e |ring sv-|point in|
|00005690| 2d 62 75 66 66 65 72 20 | 62 65 67 20 65 6e 64 20 |-buffer |beg end |
|000056a0| 6f 75 74 2d 62 75 66 66 | 65 72 20 65 72 61 73 65 |out-buff|er erase|
|000056b0| 2d 62 75 66 66 65 72 20 | 65 64 69 66 66 2d 77 68 |-buffer |ediff-wh|
|000056c0| 69 74 65 73 70 61 63 65 | 20 63 6f 6e 74 72 6f 6c |itespace| control|
|000056d0| 2d 62 75 66 20 53 74 61 | 72 74 42 75 66 66 65 72 |-buf Sta|rtBuffer|
|000056e0| 20 67 65 74 2d 62 75 66 | 66 65 72 20 62 75 66 66 | get-buf|fer buff|
|000056f0| 65 72 2d 6e 61 6d 65 20 | 28 28 73 65 74 2d 62 75 |er-name |((set-bu|
|00005700| 66 66 65 72 20 53 74 61 | 72 74 42 75 66 66 65 72 |ffer Sta|rtBuffer|
|00005710| 29 29 20 65 64 69 66 66 | 2d 66 6f 72 77 61 72 64 |)) ediff|-forward|
|00005720| 2d 77 6f 72 64 2d 66 75 | 6e 63 74 69 6f 6e 20 74 |-word-fu|nction t|
|00005730| 68 69 73 2d 63 6f 6d 6d | 61 6e 64 20 65 64 69 66 |his-comm|and edif|
|00005740| 66 2d 71 75 69 74 20 65 | 72 72 6f 72 20 65 64 69 |f-quit e|rror edi|
|00005750| 66 66 2d 4b 49 4c 4c 45 | 44 2d 56 49 54 41 4c 2d |ff-KILLE|D-VITAL-|
|00005760| 42 55 46 46 45 52 20 22 | 5c 6e 22 5d 20 33 5d 29 |BUFFER "|\n"] 3])|
|00005770| 0a 28 64 65 66 61 6c 69 | 61 73 20 27 65 64 69 66 |.(defali|as 'edif|
|00005780| 66 2d 63 6f 70 79 2d 74 | 6f 2d 62 75 66 66 65 72 |f-copy-t|o-buffer|
|00005790| 20 23 5b 28 62 65 67 20 | 65 6e 64 20 69 6e 2d 62 | #[(beg |end in-b|
|000057a0| 75 66 66 65 72 20 6f 75 | 74 2d 62 75 66 66 65 72 |uffer ou|t-buffer|
|000057b0| 29 20 22 c0 19 8a 5c 6e | 71 88 0b 5c 66 7b 11 0d |) "...\n|q..\f{..|
|000057c0| 71 88 c6 20 88 09 63 88 | 65 62 2a 87 22 20 5b 6e |q.. ..c.|eb*." [n|
|000057d0| 69 6c 20 73 74 72 69 6e | 67 20 69 6e 2d 62 75 66 |il strin|g in-buf|
|000057e0| 66 65 72 20 62 65 67 20 | 65 6e 64 20 6f 75 74 2d |fer beg |end out-|
|000057f0| 62 75 66 66 65 72 20 65 | 72 61 73 65 2d 62 75 66 |buffer e|rase-buf|
|00005800| 66 65 72 5d 20 32 5d 29 | 0a 28 64 65 66 61 6c 69 |fer] 2])|.(defali|
|00005810| 61 73 20 27 65 64 69 66 | 66 2d 67 6f 74 6f 2d 77 |as 'edif|f-goto-w|
|00005820| 6f 72 64 20 23 5b 28 6e | 20 62 75 66 20 26 6f 70 |ord #[(n| buf &op|
|00005830| 74 69 6f 6e 61 6c 20 66 | 6c 61 67 29 20 22 08 19 |tional f|lag) "..|
|00005840| 70 1a 0b 83 4c 00 c4 0b | 21 83 4c 00 c5 c4 0b 21 |p...L...|!.L....!|
|00005850| 21 83 4c 00 c6 8e 0b 71 | 88 0e 07 c8 77 88 0e 09 |!.L....q|....w...|
|00005860| ca 56 83 38 00 09 20 88 | 0e 07 c8 77 88 0e 09 53 |.V.8.. .|...w...S|
|00005870| 89 16 09 82 5c 22 00 0e | 0b 83 47 00 0e 09 cc 56 |....\"..|..G....V|
|00005880| 83 47 00 09 20 88 60 29 | 82 57 00 0e 0d ce 3d 86 |.G.. .`)|.W....=.|
|00005890| 57 00 cf 0e 10 21 2a 87 | 22 20 5b 65 64 69 66 66 |W....!*.|" [ediff|
|000058a0| 2d 66 6f 72 77 61 72 64 | 2d 77 6f 72 64 2d 66 75 |-forward|-word-fu|
|000058b0| 6e 63 74 69 6f 6e 20 66 | 77 64 2d 77 6f 72 64 2d |nction f|wd-word-|
|000058c0| 66 75 6e 20 53 74 61 72 | 74 42 75 66 66 65 72 20 |fun Star|tBuffer |
|000058d0| 62 75 66 20 67 65 74 2d | 62 75 66 66 65 72 20 62 |buf get-|buffer b|
|000058e0| 75 66 66 65 72 2d 6e 61 | 6d 65 20 28 28 73 65 74 |uffer-na|me ((set|
|000058f0| 2d 62 75 66 66 65 72 20 | 53 74 61 72 74 42 75 66 |-buffer |StartBuf|
|00005900| 66 65 72 29 29 20 65 64 | 69 66 66 2d 77 68 69 74 |fer)) ed|iff-whit|
|00005910| 65 73 70 61 63 65 20 6e | 69 6c 20 6e 20 31 20 66 |espace n|il n 1 f|
|00005920| 6c 61 67 20 30 20 74 68 | 69 73 2d 63 6f 6d 6d 61 |lag 0 th|is-comma|
|00005930| 6e 64 20 65 64 69 66 66 | 2d 71 75 69 74 20 65 72 |nd ediff|-quit er|
|00005940| 72 6f 72 20 65 64 69 66 | 66 2d 4b 49 4c 4c 45 44 |ror edif|f-KILLED|
|00005950| 2d 56 49 54 41 4c 2d 42 | 55 46 46 45 52 5d 20 34 |-VITAL-B|UFFER] 4|
|00005960| 5d 29 0a 28 70 72 6f 76 | 69 64 65 20 28 71 75 6f |]).(prov|ide (quo|
|00005970| 74 65 20 65 64 69 66 66 | 2d 64 69 66 66 29 29 0a |te ediff|-diff)).|
+--------+-------------------------+-------------------------+--------+--------+